Changeset 13383 for fact/tools/pyscripts

Timestamp:

04/18/12 20:36:18 (13 years ago)

Author:

neise

Message:

just a test

File:

• fact/tools/pyscripts/pyfact/pyfact.py (modified) (3 diffs)

fact/tools/pyscripts/pyfact/pyfact.py

@@ -211 +211 @@
         if self.return_dict:
             return self.__dict__
-        else:
+            else:
             return self.acal_data, self.start_cells, self.trigger_type.value
 
@@ -249 +249 @@
             roi = self.nroi
             # rotate the pixel baseline mean to the Data startCell
-            blm_pixel = blm[pixel,sc:sc+roi]
+            #blm_pixel = blm[pixel,sc:sc+roi]
             # rotate the pixel gain mean to the Data startCell
-            gm_pixel = gm[pixel,sc:sc+roi]
+            #gm_pixel = gm[pixel,sc:sc+roi]
             # the 'trigger offset mean' does not need to be rolled
             # on the contrary, it seems there is an offset in the DRS data,
             # which is related to its distance to the startCell, not to its 
             # distance to the beginning of the physical pipeline in the DRS chip
-            tom_pixel = tom[pixel,0:roi]
+            #tom_pixel = tom[pixel,0:roi]
             
-            acal_data[pixel,:] -= blm_pixel
-            acal_data[pixel,:] -= tom_pixel
-            acal_data[pixel,:] /= gm_pixel
+            #acal_data[pixel,:] -= blm_pixel
+            #acal_data[pixel,:] -= tom_pixel
+            #acal_data[pixel,:] /= gm_pixel
+            acal_data[pixel,:] -= blm[pixel,sc:sc+roi]
+            acal_data[pixel,:] -= tom[pixel,0:roi]
+            acal_data[pixel,:] /= gm[pixel,sc:sc+roi]
             
         self.acal_data = acal_data * 1907.35
@@ -271 +274 @@
         #t = np.roll( gm[0,:], -self.start_cells[0] )
         #print 'gm _pyfact: ', t[0:10] 
-        self.user_action_calib( self.acal_data, 
-            np.reshape(self.data, (self.npix, self.nroi) ), blm, tom, gm, self.start_cells, self.nroi)
+        #self.user_action_calib( self.acal_data, 
+        #    np.reshape(self.data, (self.npix, self.nroi) ), blm, tom, gm, self.start_cells, self.nroi)