Changeset 2148

Timestamp:

Feb 13, 2016 1:56:05 PM (6 years ago)

Author:

vondreele

Message:

ReadPowderInstprm? modified to handle multibank instprm files. Fails if bank missing.

File:

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

trunk/GSASII.py

@@ -956 +956 @@
         similar to G2pwdGUI.OnLoad
         If instprm file has multiple banks each with header #Bank n: ..., this 
-        finds matching bank no. to load - rejects nonmatches.
+        finds matching bank no. to load - problem with nonmatches?
 
         :param list instLines: strings from GSAS-II parameter file; can be concatenated with ';'
@@ -964 +964 @@
 
         '''
-        if not instLines[0].startswith('#GSAS-II'): # not a valid file
-            return None
+        if 'GSAS-II' not in instLines[0]: # not a valid file
+            return 'Not a valid GSAS-II instprm file'
         newItems = []
         newVals = []
         Found = False
-        for S in instLines:
+        il = 0
+        while il < len(instLines):
+            S = instLines[il]
             if S[0] == '#':
-                continue
+                if Found:
+                    break
+                if 'Bank' in S:
+                    if bank == int(S.split(':')[0].split()[1]):
+                        il += 1
+                        S = instLines[il]
+                    else:
+                        il += 1
+                        S = instLines[il]
+                        while il < len(instLines) and '#Bank' not in S:
+                            il += 1
+                            if il == len(instLines):
+                                return 'Bank %d not found in .instprm file'%(bank)
+                            S = instLines[il]
+                        continue
+                else:   #a non #Bank file
+                    il += 1
+                    S = instLines[il]
+            Found = True
             S = S.replace(' ','')
             SS = S[:-1].split(';')
@@ -980 +1000 @@
                     newVals.append(float(val))
                 except ValueError:
-                    newVals.append(val)                        
+                    newVals.append(val)
+            il += 1                        
         return G2IO.makeInstDict(newItems,newVals,len(newVals)*[False,]),{}
         
@@ -1233 +1254 @@
                 if Lines is not None:
                     instParmList = self.ReadPowderInstprm(Lines,bank)    #know Bank - see above
-                if instParmList is not None:
+                if 'list' in str(type(instParmList)):
                     rd.instfile = instfile
                     rd.instmsg = 'GSAS-II file '+instfile
                     return instParmList
+                else:
+                    rd.instmsg = instParmList   #an error message
+                    return None
                 Iparm = self.ReadPowderIparm(instfile,bank,numbanks,rd)
                 if Iparm: