Changeset 2628 for trunk/GSASII.py

Timestamp:

Jan 12, 2017 3:50:49 PM (7 years ago)

Author:

toby

Message:

force selection of new instparm when data limits/number of points changes when multiple files are read

File:

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

trunk/GSASII.py

@@ -1502 +1502 @@
         lastdatafile = ''
         newHistList = []
+        lastVals = []
         self.EnablePlot = False
         for rd in rdlist:
-            if 'Instrument Parameters' not in rd.pwdparms:
+            if 'Instrument Parameters' in rd.pwdparms:
+                Iparm1,Iparm2 = rd.pwdparms['Instrument Parameters']
+            else:
                 # get instrument parameters for each dataset, unless already set
+                if lastIparmfile:  # is this histogram like previous?
+                    if lastVals != (rd.powderdata[0].min(),rd.powderdata[0].max(),len(rd.powderdata[0])):
+                        lastIparmfile = ''
                 Iparms = self.GetPowderIparm(rd, Iparm, lastIparmfile, lastdatafile)
                 if not Iparms:  #may have bailed out
@@ -1513 +1519 @@
                 if rd.repeat_instparm: 
                     lastIparmfile = rd.instfile
+                    lastVals = (rd.powderdata[0].min(),rd.powderdata[0].max(),len(rd.powderdata[0]))
                 # override any keys in read instrument parameters with ones set in import
                 for key in Iparm1:  
                     if key in rd.instdict:
                         Iparm1[key] = rd.instdict[key]
-            else:
-                Iparm1,Iparm2 = rd.pwdparms['Instrument Parameters']
             lastdatafile = rd.powderentry[0]
             HistName = rd.idstring
@@ -1694 +1699 @@
         self.CheckNotebook()
         Iparm = None
-        lastIparmfile = ''
         lastdatafile = ''
         self.zipfile = None
         # get instrument parameters for it
-        Iparm1,Iparm2 = self.GetPowderIparm(rd, Iparm, lastIparmfile, lastdatafile)
+        Iparm1,Iparm2 = self.GetPowderIparm(rd, Iparm, '', lastdatafile)
         if 'T' in Iparm1['Type'][0]:
             print('TOF simulation not supported yet')