Changeset 1834 for trunk/imports/G2pwd_fxye.py

Timestamp:

May 4, 2015 9:10:23 AM (8 years ago)

Author:

vondreele

Message:

redefine azimuthal angle in Sample Parms as the center of the azimuthal bin; the azimuthat angle in Instrument parms is defined as the mean angle for polarization (only 0-90 & slightly different)
some cosmetic changes to GUI displays
fix imports/G2pwd_fxye.py to handle multi time-maps found in HIPPO data & the slightly screwy one in HIPD data

File:

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

trunk/imports/G2pwd_fxye.py

@@ -135 +135 @@
             N = len(x)
             if self.clockWd:
-                x = Tmap2TOF(self.TimeMap[cons[5]],self.clockWd[cons[5]])
+                if len(self.clockWd) == 1:
+                    x = Tmap2TOF(self.TimeMap['1'],self.clockWd['1'])
+                else:
+                    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)]
         
@@ -177 +180 @@
             N = len(x)
             if self.clockWd:
-                x = Tmap2TOF(self.TimeMap[cons[5]],self.clockWd[cons[5]])
+                if len(self.clockWd) == 1:
+                    x = Tmap2TOF(self.TimeMap['1'],self.clockWd['1'])
+                else:
+                    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)]
            
@@ -213 +219 @@
             cons = TimeMap[8:].split()
             mapNo = cons[0]
-            if mapNo == '10': mapNo = '1'   #HIPD cluge!
+            if 'TIME_MAP10' in TimeMap: mapNo = '1'   #HIPD cluge!
             Nch = int(cons[1])
             Nrec = int(cons[2])