Changeset 1632

Timestamp:

Jan 21, 2015 4:23:24 PM (9 years ago)

Author:

vondreele

Message:

Add new importer for RALF weird ALT data

File:

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

trunk/imports/G2pwd_fxye.py

@@ -171 +171 @@
             if self.clockWd:
                 x = Tmap2TOF(self.TimeMap,self.clockWd)[:-2]
+            return [np.array(x),np.array(y),np.array(w),np.zeros(N),np.zeros(N),np.zeros(N)]
+           
+        def GetALTdata(File,Pos,Bank):
+            File.seek(Pos)
+            cons = Bank.split()
+            x = []
+            y = []
+            w = []
+            S = File.readline()
+            j = 0
+            while S and S[:4] != 'BANK' and S[0] != '#':
+                for i in range(0,80,20):
+                    xi = sfloat(S[i:i+9])/3200.
+                    yi = sfloat(S[i+9:i+16])/1000.
+                    ei = sfloat(S[i+16:i+21])/1000.
+                    x.append(xi)
+                    if yi > 0.0:
+                        y.append(yi)
+                        w.append(1.0/ei**2)
+                    else:              
+                        y.append(0.0)
+                        w.append(0.0)
+                    j += 1
+                S = File.readline()
+            N = len(x)
+            if self.clockWd:
+                x = Tmap2TOF(self.TimeMap,clockWd)
             return [np.array(x),np.array(y),np.array(w),np.zeros(N),np.zeros(N),np.zeros(N)]
             
@@ -317 +344 @@
                 self.errors = 'Error reading STD data in Bank\n  '+Banks[selblk]
                 self.powderdata = GetSTDdata(filepointer,Pos[selblk],Banks[selblk])
+            elif 'ALT' in Bank:
+                self.errors = 'Error reading ALT data in Bank\n  '+Banks[selblk]
+                self.powderdata = GetALTdata(filepointer,Pos[selblk],Banks[selblk])
             else:
                 self.errors = 'Error reading STD data in Bank\n  '+Banks[selblk]