Changeset 616

Timestamp:

May 16, 2012 11:55:38 AM (12 years ago)

Author:

toby

Message:

clean up default instrument parameters

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIIO.py (modified) (3 diffs)

trunk/GSASII.py

@@ -605 +605 @@
             instfile = ''
             dlg = wx.FileDialog(self,
-                                'Choose an instrument file for '
+                                'Choose inst parm file for "'
                                 +rd.idstring
-                                +' or press Cancel to select a default setting',
+                                +'" (Cancel for defaults)',
                                 '.', '',
                                 'GSAS iparm file (*.prm)|*.prm|All files(*.*)|*.*', 
@@ -627 +627 @@
                                  'Error opening/reading file '+str(instfile))
         
-        # still no success: offer the user a last choice
-        msg = 'Are the data from '  + rd.idstring
-        msg += ''' laboratory Cu Ka1/Ka2 data? 
-(No = 0.6A wavelength synchrotron data)
-Change wavelength in Instrument Parameters if needed'''
-        dlg = wx.MessageDialog(self, msg, 'Data type?',
-                               wx.YES_NO | wx.ICON_QUESTION)
-        try:
-            result = dlg.ShowModal()
-        finally:
-            dlg.Destroy()
-        if result == wx.ID_YES:
+        # still no success: offer user choice of defaults
+        while True: # loop until we get a choice
+            choices = []
+            head = 'Select from default instrument parameters for '+rd.idstring
+
+            for l in rd.defaultIparm_lbl:
+                choices.append('Defaults for '+l)
+            res = rd.BlockSelector(
+                choices,
+                ParentFrame=self,
+                title=head,
+                header='Select default inst parms',)
+            if res is None: continue
             rd.instfile = ''
-            rd.instmsg = 'default: CuKa12'
-            return rd.Iparm_CuKa12
-        else:
-            rd.instfile = ''
-            rd.instmsg =  'default: 0.6A synchrotron'
-            return rd.Iparm_Sync06
+            rd.instmsg = 'default: '+rd.defaultIparm_lbl[res]
+            return rd.defaultIparms[res]
 
     def SetPowderInstParms(self, Iparm, rd):

trunk/GSASIIIO.py

@@ -1581 +1581 @@
     # define some default instrument parameter files
     # just like GSAS, sigh
-    Iparm_CuKa12 = { # Default Inst. parms for CuKa lab data
+    defaultIparm_lbl = []
+    defaultIparms = []
+    defaultIparm_lbl.append('CuKa lab data')
+    defaultIparms.append({
         'INS   HTYPE ':'PXC ',
         'INS  1 ICONS':'  1.540500  1.544300       0.0         0       0.7    0       0.5   ',
@@ -1587 +1590 @@
         'INS  1PRCF11':'   2.000000E+00  -2.000000E+00   5.000000E+00   0.000000E+00        ',
         'INS  1PRCF12':'   0.000000E+00   0.000000E+00   0.150000E-01   0.150000E-01        ',
-        }
-    Iparm_Sync06 = { # Default Inst. parms for 0.6A synchrotron data
+        })
+    defaultIparm_lbl.append('0.6A synch')
+    defaultIparms.append({
         'INS   HTYPE ':'PXC ',
         'INS  1 ICONS':'  0.600000  0.000000       0.0         0      0.99    0       0.5   ',
@@ -1594 +1598 @@
         'INS  1PRCF11':'   1.000000E+00  -1.000000E+00   0.300000E+00   0.000000E+00        ',
         'INS  1PRCF12':'   0.000000E+00   0.000000E+00   0.100000E-01   0.100000E-01        ',
-        }
+        })
+    defaultIparm_lbl.append('1.5A CW neutron data')
+    defaultIparms.append({
+        'INS   HTYPE ':'PNC',
+        'INS  1 ICONS':'   1.54020   0.00000   0.04000         0',
+        'INS  1PRCF1 ':'    3    8      0.01                                                ',
+        'INS  1PRCF1 ':'    3    8     0.005',
+        'INS  1PRCF11':'   0.239700E+03  -0.298200E+03   0.180800E+03   0.000000E+00',
+        'INS  1PRCF12':'   0.000000E+00   0.000000E+00   0.400000E-01   0.300000E-01',
+        })
     def __init__(self,
                  formatName,