Changeset 1574

Timestamp:

Nov 20, 2014 12:57:51 PM (7 years ago)

Author:

toby

Message:

import PWDR parms when importing from GPX

Location:

trunk

Files:

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

trunk/GSASII.py

@@ -1266 +1266 @@
         self.EnablePlot = False
         for rd in rdlist:
-            # get instrument parameters for each dataset
-            Iparm1,Iparm2 = self.GetPowderIparm(rd, Iparm, lastIparmfile, lastdatafile)
-            if rd.repeat_instparm: 
-                lastIparmfile = rd.instfile
+            if 'Instrument Parameters' not in rd.pwdparms:
+                # get instrument parameters for each dataset, unless already set 
+                Iparm1,Iparm2 = self.GetPowderIparm(rd, Iparm, lastIparmfile, lastdatafile)
+                if rd.repeat_instparm: 
+                    lastIparmfile = rd.instfile
+            else:
+                Iparm1,Iparm2 = rd.pwdparms['Instrument Parameters']
             lastdatafile = rd.powderentry[0]
             HistName = rd.idstring
@@ -1304 +1307 @@
                 rd.powderdata[4] = np.zeros_like(rd.powderdata[0])                                        
                 rd.powderdata[5] = np.zeros_like(rd.powderdata[0])                                        
-            Tmin = min(rd.powderdata[0])
-            Tmax = max(rd.powderdata[0])
             valuesdict = {
                 'wtFactor':1.0,
@@ -1316 +1317 @@
                 self.PatternTree.AppendItem(Id,text='Comments'),
                 rd.comments)
+            Tmin = min(rd.powderdata[0])
+            Tmax = max(rd.powderdata[0])
             self.PatternTree.SetItemPyData(
                 self.PatternTree.AppendItem(Id,text='Limits'),
-                [(Tmin,Tmax),[Tmin,Tmax]])
+                rd.pwdparms.get('Limits',[(Tmin,Tmax),[Tmin,Tmax]])
+                )
             self.PatternId = G2gd.GetPatternTreeItemId(self,Id,'Limits')
             self.PatternTree.SetItemPyData(
                 self.PatternTree.AppendItem(Id,text='Background'),
-                [['chebyschev',True,3,1.0,0.0,0.0],
-                 {'nDebye':0,'debyeTerms':[],'nPeaks':0,'peaksList':[]}])
+                rd.pwdparms.get('Background',
+                    [['chebyschev',True,3,1.0,0.0,0.0],{'nDebye':0,'debyeTerms':[],'nPeaks':0,'peaksList':[]}])
+                    )
             self.PatternTree.SetItemPyData(
                 self.PatternTree.AppendItem(Id,text='Instrument Parameters'),

trunk/GSASIIIO.py

@@ -1710 +1710 @@
         self.numbanks = 1
         self.instdict = {} # place items here that will be transferred to the instrument parameters
+        self.pwdparms = {} # place parameters that are transferred directly to the tree
+                           # here (typically from an existing GPX file)
 ######################################################################
 class ImportSmallAngleData(ImportBaseclass):

trunk/imports/G2pwd_GPX.py

@@ -86 +86 @@
                 ParentFrame=ParentFrame,
                 title='Select histogram(s) to read from the list below',
-                size=(600,100),
+                size=(600,250),
                 header='Dataset Selector')
             if len(selections) == 0:
@@ -116 +116 @@
             self.powderentry[0] = filename
             self.powderentry[2] = selblk+1
+            # pull some sections from the PWDR children
+            for i in range(1,len(data)):
+                if data[i][0] == 'Comments':
+                    self.comments = data[i][1]
+                    continue
+                elif data[i][0] == 'Sample Parameters':
+                    self.Sample = data[i][1]
+                    continue
+                for keepitem in ('Limits','Background','Instrument Parameters'): 
+                    if data[i][0] == keepitem:
+                        self.pwdparms[data[i][0]] = data[i][1]
+                        break
             self.idstring = data[0][0][5:]
-            # 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:
-                self.warnings += "Failed to read wavelength"
-                self.warnings += '\n  '+str(detail)
-            # pull out temperature
-            try:
-                if data[5][1].get('Temperature'):
-                    self.Sample['Temperature'] = data[5][1]['Temperature']
-            except:
-                self.warnings += "Failed to read temperature"
-                self.warnings += '\n  '+str(detail)
             self.repeat_instparm = False # prevent reuse of iparm when several hists are read
             return True