Changeset 4619

Timestamp:

Oct 23, 2020 9:53:06 AM (2 years ago)

Author:

vondreele

Message:

Add pink beam check box to image data GUI
When selected, integration will set inst parms to pink beam defaults based on Sector 35 LSS data

Location:

trunk

Files:

• GSASIIIO.py (modified) (4 diffs)
• GSASIIimgGUI.py (modified) (3 diffs)

trunk/GSASIIIO.py

@@ -102 +102 @@
     :returns: the (usually) shortened version of the string
     '''
-    return re.sub('\s+', ' ', val).strip()
+    return re.sub('\\s+', ' ', val).strip()
 
 def FileDlgFixExt(dlg,file):
@@ -842 +842 @@
             codes = [0 for i in range(14)]
         else:
-            names = ['Type','Lam','Zero','Polariz.','U','V','W','X','Y','Z','SH/L','Azimuth'] 
-            codes = [0 for i in range(12)]
+            if data.get('IfPink',False):
+                names = ['Type','Lam','Zero','Polariz.','U','V','W','X','Y','Z','alpha-0','alpha-1','beta-0','beta-1','Azimuth']
+                codes = [0 for i in range(15)]
+            else:
+                names = ['Type','Lam','Zero','Polariz.','U','V','W','X','Y','Z','SH/L','Azimuth'] 
+                codes = [0 for i in range(12)]
     elif 'SASD' in name:
         names = ['Type','Lam','Zero','Azimuth'] 
@@ -895 +899 @@
                 parms = ['PXC',wave1,wave2,0.5,0.0,polariz,290.,-40.,30.,6.,-14.,0.0,0.0001,Azms[i]]
             else:
-                parms = ['PXC',data['wavelength'],0.0,polariz,1.0,-0.10,0.4,0.30,1.0,0.0,0.0001,Azms[i]]
+                if data.get('IfPink',False):
+                    parms = ['PXB',data['wavelength'],0.0,polariz,0.,8000.,-150.,-24.,0.,0.,0.,13.,-1300.,3.,-7.,Azms[i]]   #from Sect 35 LSS
+                else:
+                    parms = ['PXC',data['wavelength'],0.0,polariz,1.0,-0.10,0.4,0.30,1.0,0.0,0.0001,Azms[i]]
         elif 'SASD' in Aname:
             Sample['Trans'] = data['SampleAbs'][0]
@@ -1813 +1820 @@
             their standard uncertainty (or a negative value)
           * td is contains a list with either one or six pairs of numbers:
-            if one number it is U\ :sub:`iso` and with six numbers it is
-            U\ :sub:`11`, U\ :sub:`22`, U\ :sub:`33`, U\ :sub:`12`, U\ :sub:`13` & U\ :sub:`23`
+            if one number it is U\\ :sub:`iso` and with six numbers it is
+            U\\ :sub:`11`, U\\ :sub:`22`, U\\ :sub:`33`, U\\ :sub:`12`, U\\ :sub:`13` & U\\ :sub:`23`
             paired with their standard uncertainty (or a negative value)
         """

trunk/GSASIIimgGUI.py

@@ -1164 +1164 @@
         def OnApplyPola(event):
             data['PolaVal'][1] = not data['PolaVal'][1]
+            
+        def OnIfPink(event):
+            data['IfPink'] = not data['IfPink']
                 
         dataSizer = wx.FlexGridSizer(0,2,5,3)
-        dataSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Integration coefficients'),0,WACV)    
+        dataSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Integration coefficients'),0,WACV)    
         dataSizer.Add((5,0),0)
         if 'PWDR' in data['type']:
@@ -1172 +1175 @@
         elif 'SASD' in data['type']:
             binChoice = ['2-theta','Q','log(q)']
-        dataSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Bin style: Constant step bins in'),0,WACV)            
-        binSel = wx.ComboBox(parent=G2frame.dataWindow,value=data['binType'],choices=binChoice,
+        dataSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Bin style: Constant step bins in'),0,WACV)
+        littleSizer = wx.BoxSizer(wx.HORIZONTAL)                   
+        binSel = wx.ComboBox(G2frame.dataWindow,value=data['binType'],choices=binChoice,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         binSel.Bind(wx.EVT_COMBOBOX, OnNewBinType)
-        dataSizer.Add(binSel,0,WACV)
+        littleSizer.Add(binSel,0,WACV)
+        pinkSel = wx.CheckBox(G2frame.dataWindow,label=' Pink beam source?')
+        pinkSel.SetValue(data['IfPink'])
+        pinkSel.Bind(wx.EVT_CHECKBOX,OnIfPink)
+        littleSizer.Add(pinkSel,0,WACV)
+        dataSizer.Add(littleSizer)
         binType = '2-theta'
         if 'q' in data['binType'].lower():
@@ -1480 +1489 @@
     if 'PolaVal' not in data:
         data['PolaVal'] = [0.99,False]
+    if 'IfPink' not in data:
+        data['IfPink'] = False
     #end fix