Changeset 887 for trunk

Timestamp:

Apr 13, 2013 10:07:33 PM (12 years ago)

Author:

toby

Message:

xfer lambda & T from GPX histograms; remove Cancel from selection of default parameter set

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIIO.py (modified) (2 diffs)
• imports/G2pwd_GPX.py (modified) (1 diff)

trunk/GSASII.py ¶

@@ -821 +821 @@
                 ParentFrame=self,
                 title=head,
-                header='Select default inst parms',)
+                header='Select default inst parms',
+                useCancel=False)
             if res is None: continue
             rd.instfile = ''

trunk/GSASIIIO.py ¶

@@ -1180 +1180 @@
     def BlockSelector(self, ChoiceList, ParentFrame=None,
                       title='Select a block',
-                      size=None, header='Block Selector'):
+                      size=None, header='Block Selector',
+                      useCancel=True):
         ''' Provide a wx dialog to select a block if the file contains more
         than one set of data and one must be selected
         '''
-        dlg = wx.SingleChoiceDialog(ParentFrame,title, header,ChoiceList,)
+        if useCancel:
+            dlg = wx.SingleChoiceDialog(
+                ParentFrame,title, header,ChoiceList)
+        else:
+            dlg = wx.SingleChoiceDialog(
+                ParentFrame,title, header,ChoiceList,
+                style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER|wx.OK|wx.CENTRE)
         if size: dlg.SetSize(size)
         if dlg.ShowModal() == wx.ID_OK:
@@ -1439 +1446 @@
         self.idstring = ''
         self.Sample = G2pdG.SetDefaultSample()
+        self.GSAS = None     # used in TOF
+        self.clockWd = None  # used in TOF
         self.repeat_instparm = True # Should a parm file be
         #                             used for multiple histograms? 

trunk/imports/G2pwd_GPX.py ¶

@@ -108 +108 @@
             self.powderentry[2] = selblk+1
             self.idstring = data[0][0][5:]
-            # could pull out wavelength from data[4][1] here
-            # and save it as self.instdict['wave'] = wl
-            # likewise for dataset type as self.instdict['type'] = 'SNC' etc
-            # and self.Sample['Temperature'] for T
+            # pull out wavelength 
+            try:
+                if len(data[4][1]) == 2: # current GPX file
+                    if data[4][1][0].get('Lam'):
+                        self.instdict['wave'] = [data[4][1][0].get('Lam')[1]]
+                    elif data[4][1][0].get('Lam1') and data[4][1][0].get('Lam2'):
+                        self.instdict['wave'] = [
+                            data[4][1][0].get('Lam1')[1],
+                            data[4][1][0].get('Lam2')[1]
+                            ]
+                elif len(data[4][1]) == 4: # original GPX file
+                    pos = data[4][1][3].index('Lam')
+                    self.instdict['wave'] = [data[4][1][1][pos],]
+            except:
+                pass
+            # pull out temperature
+            try:
+                if data[5][1].get('Temperature'):
+                    self.Sample['Temperature'] = data[5][1]['Temperature']
+            except:
+                pass
             self.repeat_instparm = False # prevent reuse of iparm when several hists are read
             return True