Changeset 1174 for trunk/GSASIIimgGUI.py

Timestamp:

Dec 18, 2013 2:55:50 PM (10 years ago)

Author:

vondreele

Message:

correct image integration for sample absorption - cylinders only for now

File:

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

trunk/GSASIIimgGUI.py

@@ -51 +51 @@
         data['DetDepth'] = 0.
         data['DetDepthRef'] = False
+    if 'SampleAbs' not in data:
+        data['SampleShape'] = 'Cylinder'
+        data['SampleAbs'] = [0.0,False]
 #end patch
 
@@ -513 +516 @@
             obliqVal.SetValue('%.3f'%(data['Oblique'][0]))
                            
+        def OnSamAbs(event):
+            if data['SampleAbs'][1]:
+                data['SampleAbs'][1] = False
+            else:
+                data['SampleAbs'][1] = True
+                
+        def OnSamAbsVal(event):
+            try:
+                value = float(samabsVal.GetValue())
+                if 0.00 <= value <= 2.00:
+                    data['SampleAbs'][0] = value
+                else:
+                    raise ValueError
+            except ValueError:
+                pass
+            samabsVal.SetValue('%.3f'%(data['SampleAbs'][0]))
+                           
         def OnShowLines(event):
             if data['showLines']:
@@ -614 +634 @@
         outAzim.Bind(wx.EVT_KILL_FOCUS,OnNumOutAzms)
         littleSizer.Add(outAzim,0,wx.ALIGN_CENTER_VERTICAL)
+        dataSizer.Add(littleSizer,0,)
+        littleSizer = wx.BoxSizer(wx.HORIZONTAL)
+        samabs = wx.CheckBox(parent=G2frame.dataDisplay,label='Apply sample absorption?')
+        dataSizer.Add(samabs,0,wx.ALIGN_CENTER_VERTICAL)
+        samabs.Bind(wx.EVT_CHECKBOX, OnSamAbs)
+        samabs.SetValue(data['SampleAbs'][1])
+        littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label='mu/R (0.00-2.0) '),0,
+            wx.ALIGN_CENTER_VERTICAL)
+        samabsVal = wx.TextCtrl(parent=G2frame.dataDisplay,value='%.3f'%(data['SampleAbs'][0]),style=wx.TE_PROCESS_ENTER)
+        samabsVal.Bind(wx.EVT_TEXT_ENTER,OnSamAbsVal)
+        samabsVal.Bind(wx.EVT_KILL_FOCUS,OnSamAbsVal)
+        littleSizer.Add(samabsVal,0,wx.ALIGN_CENTER_VERTICAL)
         dataSizer.Add(littleSizer,0,)
         littleSizer = wx.BoxSizer(wx.HORIZONTAL)