Changeset 1644 for trunk/GSASIIimgGUI.py


Ignore:
Timestamp:
Feb 10, 2015 1:24:18 PM (7 years ago)
Author:
vondreele
Message:

setting up image calibration to allow more control over refined parameters

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimgGUI.py

    r1619 r1644  
    9999    if 'DetDepth' not in data:
    100100        data['DetDepth'] = 0.
    101         data['DetDepthRef'] = False
    102101    if 'SampleAbs' not in data:
    103102        data['SampleShape'] = 'Cylinder'
     
    108107        elif 'SASD' in data['type']:
    109108            data['binType'] = 'log(q)'
     109    if 'varyList' not in data:
     110        data['varyList'] = {'dist':True,'det-X':True,'det-Y':True,'tilt':True,'phi':True,'dep':False,'wave':False}
    110111#end patch
    111112   
     
    480481           
    481482        def OnDetDepthRef(event):
    482             data['DetDepthRef'] = penSel.GetValue()
     483            data['varyList']['dep'] = penSel.GetValue()
    483484           
    484485        def OnDetDepth(event):
     
    505506        calibSizer.Add(waveSel,0,WACV)             
    506507        calibSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Distance'),0,WACV)
    507 #        dist = wx.CheckBox(G2frame.dataDisplay,label=' Distance')  #possible future mod. to allow fix of calib. parms.?
     508#        distVary = wx.CheckBox(G2frame.dataDisplay,label=' Distance')
    508509        distSel = wx.TextCtrl(parent=G2frame.dataDisplay,value=("%8.2f"%(data['distance'])),style=wx.TE_READONLY)
    509510        distSel.SetBackgroundColour(VERY_LIGHT_GREY)
     
    521522            calibSizer.Add(penSel,0,WACV)
    522523            penSel.Bind(wx.EVT_CHECKBOX, OnDetDepthRef)
    523             penSel.SetValue(data['DetDepthRef'])
     524            penSel.SetValue(data['varyList']['dep'])
    524525            penVal = wx.TextCtrl(parent=G2frame.dataDisplay,value=("%6.5f" % (data['DetDepth'])),
    525526                style=wx.TE_PROCESS_ENTER)
Note: See TracChangeset for help on using the changeset viewer.