Changeset 1713

Timestamp:

Mar 16, 2015 11:03:41 AM (9 years ago)

Author:

vondreele

Message:

fix problems with imports of old TOF data; bank nos. now are as given in parm/data file rather than starting with 1...

Location:

trunk

Files:

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

trunk/GSASII.py

@@ -943 +943 @@
         IparmS = {}
         for key in Iparm:
-            if key[4:6] == "  ":
-                IparmS[key] = Iparm[key]
-            elif int(key[4:6].strip()) == bank:
-                IparmS[key[:4]+' 1'+key[6:]] = Iparm[key]
+            if 'INS' in key[:3]:    #skip around rubbish lines in some old iparm files
+                if key[4:6] == "  ":
+                    IparmS[key] = Iparm[key]
+                elif int(key[4:6].strip()) == bank:
+                    IparmS[key[:4]+' 1'+key[6:]] = Iparm[key]
         rd.instbank = bank
         return IparmS

trunk/imports/G2pwd_fxye.py

@@ -332 +332 @@
         Bank = Banks[selblk]
         try:
+            bnkNo = int(Bank.split()[1])
+        except ValueError:
+            bnkNo = 1
+        try:
             if 'FXYE' in Bank:
                 self.errors = 'Error reading FXYE data in Bank\n  '+Banks[selblk]
@@ -362 +366 @@
         self.powderentry[0] = filename
         self.powderentry[1] = Pos # position offset (never used, I hope)
-        self.powderentry[2] = selblk+1 # bank number
-        self.idstring = ospath.basename(filename) + ' Bank '+str(selblk+1)
+        self.powderentry[2] = bnkNo #selblk+1 # bank number
+        self.idstring = ospath.basename(filename) + ' Bank '+str(bnkNo) #selblk+1)
         self.numbanks=len(Banks)
         # scan comments for temperature & radius