Changeset 1644 for trunk/GSASIIimgGUI.py

Timestamp:

Feb 10, 2015 1:24:18 PM (8 years ago)

Author:

vondreele

Message:

setting up image calibration to allow more control over refined parameters

File:

• trunk/GSASIIimgGUI.py (modified) (5 diffs)

trunk/GSASIIimgGUI.py

@@ -99 +99 @@
     if 'DetDepth' not in data:
         data['DetDepth'] = 0.
-        data['DetDepthRef'] = False
     if 'SampleAbs' not in data:
         data['SampleShape'] = 'Cylinder'
@@ -108 +107 @@
         elif 'SASD' in data['type']:
             data['binType'] = 'log(q)'
+    if 'varyList' not in data:
+        data['varyList'] = {'dist':True,'det-X':True,'det-Y':True,'tilt':True,'phi':True,'dep':False,'wave':False}
 #end patch
     
@@ -480 +481 @@
             
         def OnDetDepthRef(event):
-            data['DetDepthRef'] = penSel.GetValue()
+            data['varyList']['dep'] = penSel.GetValue()
             
         def OnDetDepth(event):
@@ -505 +506 @@
         calibSizer.Add(waveSel,0,WACV)             
         calibSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Distance'),0,WACV)
-#        dist = wx.CheckBox(G2frame.dataDisplay,label=' Distance')  #possible future mod. to allow fix of calib. parms.?
+#        distVary = wx.CheckBox(G2frame.dataDisplay,label=' Distance')
         distSel = wx.TextCtrl(parent=G2frame.dataDisplay,value=("%8.2f"%(data['distance'])),style=wx.TE_READONLY)
         distSel.SetBackgroundColour(VERY_LIGHT_GREY)
@@ -521 +522 @@
             calibSizer.Add(penSel,0,WACV)
             penSel.Bind(wx.EVT_CHECKBOX, OnDetDepthRef)
-            penSel.SetValue(data['DetDepthRef'])
+            penSel.SetValue(data['varyList']['dep'])
             penVal = wx.TextCtrl(parent=G2frame.dataDisplay,value=("%6.5f" % (data['DetDepth'])),
                 style=wx.TE_PROCESS_ENTER)