Ignore:
Timestamp:
Sep 27, 2017 3:18:40 PM (4 years ago)
Author:
vondreele
Message:

implement fix FXU for sequential refinements

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIddataGUI.py

    r3092 r3100  
    829829            h,k,l = hkl
    830830            Obj.SetValue('%3d %3d %3d'%(h,k,l))
     831           
     832        def OnFixVals(event):
     833            Obj = event.GetEventObject()
     834            UseList[G2frame.hist]['Fix FXU'] = Obj.GetValue()
    831835
    832836        if G2frame.hist not in UseList:               
     
    842846        if 'Babinet' not in UseList[G2frame.hist]:
    843847            UseList[G2frame.hist]['Babinet'] = {'BabA':[0.0,False],'BabU':[0.0,False]}
    844         if 'Fix X' not in UseList[G2frame.hist]:
    845             UseList[G2frame.hist]['Fix F'] = False
    846             UseList[G2frame.hist]['Fix X'] = False
    847             UseList[G2frame.hist]['Fix U'] = False
     848        if 'Fix FXU' not in UseList[G2frame.hist]:
     849            UseList[G2frame.hist]['Fix FXU'] = ' '
    848850        bottomSizer = wx.BoxSizer(wx.VERTICAL)
    849851        useBox = wx.BoxSizer(wx.HORIZONTAL)
     
    859861            if UseList[G2frame.hist]['LeBail']:
    860862                G2frame.SetStatusText('To reset LeBail, cycle LeBail check box.',1)
     863        bottomSizer.Add(useBox,0,WACV|wx.TOP|wx.BOTTOM|wx.LEFT,5)
     864        fixBox = wx.BoxSizer(wx.HORIZONTAL)
     865        parmChoice = [' ','X','XU','U','F','FX','FXU','FU']
     866        if generalData['Type'] == 'magnetic':
     867            parmChoice += ['M','MX','MXU','MU','MF','MFX','MFXU','MFU']
     868        fixBox.Add(wx.StaticText(DData,label=' In sequential refinement, fix these in '+generalData['Name']+' for this histogram: '),0,WACV)
     869        fixVals = wx.ComboBox(DData,value=UseList[G2frame.hist]['Fix FXU'],choices=parmChoice,
     870            style=wx.CB_DROPDOWN)
     871        fixVals.Bind(wx.wx.EVT_COMBOBOX,OnFixVals)
     872        fixBox.Add(fixVals,0,WACV)
     873        bottomSizer.Add(fixBox)
    861874        #TODO - put Sequential refinement fix F? fix X? fix U? CheckBox here
    862         bottomSizer.Add(useBox,0,WACV|wx.TOP|wx.BOTTOM|wx.LEFT,5)
    863875       
    864876        bottomSizer.Add(ScaleSizer(),0,WACV|wx.BOTTOM,5)
Note: See TracChangeset for help on using the changeset viewer.