Changeset 1829 for trunk/imports/G2pwd_fxye.py

Timestamp:

Apr 30, 2015 4:34:19 PM (8 years ago)

Author:

vondreele

Message:

fix importers for HIPD & HIPPO data

File:

• trunk/imports/G2pwd_fxye.py (modified) (11 diffs)

trunk/imports/G2pwd_fxye.py

@@ -30 +30 @@
             longFormatName = 'GSAS powder data files (.fxye, .raw, .gsas...)'
             )
-        self.clockWd = None
+        self.clockWd = {}
+        self.TimeMap = {}
 
     # Validate the contents -- look for a bank line
@@ -103 +104 @@
             File.seek(Pos)
             cons = Bank.split()
-            if self.clockWd:
+            if 'TIME_MAP' == cons[4]:
                 start = 0
                 step = 1
@@ -115 +116 @@
             j = 0
             while S and S[:4] != 'BANK' and S[0] != '#':
+                if 'TIME_MAP' in S:
+                    break
                 for i in range(0,80,16):
+                    if S[i:i+8] == 8*' ':
+                        break
                     xi = start+step*j
                     yi = sfloat(S[i:i+8])
@@ -130 +135 @@
             N = len(x)
             if self.clockWd:
-                x = Tmap2TOF(self.TimeMap,clockWd)
+                x = Tmap2TOF(self.TimeMap[cons[5]],self.clockWd[cons[5]])
             return [np.array(x),np.array(y),np.array(w),np.zeros(N),np.zeros(N),np.zeros(N)]
         
@@ -150 +155 @@
             while S and S[:4] != 'BANK' and S[0] != '#':
                 for i in range(0,80,8):
+                    if S[i:i+10] == 10*' ':
+                        break
                     xi = start+step*j
                     ni = max(sint(S[i:i+2]),1)
@@ -170 +177 @@
             N = len(x)
             if self.clockWd:
-                x = Tmap2TOF(self.TimeMap,self.clockWd)[:-2]
+                x = Tmap2TOF(self.TimeMap[cons[5]],self.clockWd[cons[5]])
             return [np.array(x),np.array(y),np.array(w),np.zeros(N),np.zeros(N),np.zeros(N)]
            
@@ -183 +190 @@
             while S and S[:4] != 'BANK' and S[0] != '#':
                 for i in range(0,80,20):
+                    if S[i:i+8] == 9*' ':
+                        break
                     xi = sfloat(S[i:i+9])/3200.
                     yi = sfloat(S[i+9:i+16])/1000.
@@ -197 +206 @@
             N = len(x)
             if self.clockWd:
-                x = Tmap2TOF(self.TimeMap,clockWd)
+                x = Tmap2TOF(self.TimeMap[cons[5]],self.clockWd[cons[5]])
             return [np.array(x),np.array(y),np.array(w),np.zeros(N),np.zeros(N),np.zeros(N)]
             
@@ -203 +212 @@
             File.seek(Pos)
             cons = TimeMap[8:].split()
-            mapNo = int(cons[0])
+            mapNo = cons[0]
+            if mapNo == '10': mapNo = '1'   #HIPD cluge!
             Nch = int(cons[1])
             Nrec = int(cons[2])
@@ -221 +231 @@
             TMap = TMap.T
             TMap[0] -= 1
-            return TMap.T,clockWd
+            return TMap.T,clockWd,mapNo
             
         def Tmap2TOF(TMap,clockWd):
@@ -289 +299 @@
                         else:
                             self.errors = 'Error reading time map after bank:\n  '+str(Banks[-1])
-                        self.TimeMap,self.clockWd = GetTimeMap(filepointer,filepointer.tell(),S)
+                        timemap,clockwd,mapNo = GetTimeMap(filepointer,filepointer.tell(),S)
+                        self.TimeMap[mapNo] = timemap
+                        self.clockWd[mapNo] = clockwd 
+                        
             except Exception as detail:
                 self.errors += '\n  '+str(detail)