Changeset 13142 for fact/tools/pyscripts/pyfact

Timestamp:

03/19/12 11:34:36 (13 years ago)

Author:

neise

Message:

included tab checking, and substituded all tabs by spaces

File:

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

fact/tools/pyscripts/pyfact/pyfact.py

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/python -tt
 #
 # Werner Lustermann
@@ -28 +28 @@
 
     def __init__(self, data_file_name, calib_file_name, 
-                 user_action_calib=lambda acal_data, data, blm, tom, gm, scells, nroi: None,
-                 baseline_file_name=''):
+                user_action_calib=lambda acal_data, data, blm, tom, gm, scells, nroi: None,
+                baseline_file_name=''):
         """ initialize object
 
@@ -45 +45 @@
         self.calib_file_name = calib_file_name
         self.baseline_file_name = baseline_file_name
-            
-        self.user_action_calib = user_action_calib
+
+        self.user_action_calib = user_action_calib
         
         # baseline correction: True / False
@@ -136 +136 @@
 
         #print 'nevents = ', self.nevents, 'event_id = ', self.event_id.value
-        
+
         return self.acal_data, self.start_cells, self.trigger_type.value
 
@@ -172 +172 @@
             
         self.acal_data = acal_data * 1907.35
-        
-        #print 'blm _pyfact', blm[0,0:20] 
-        #t = np.roll( blm[0,:], -self.start_cells[0] )
-        #print 'blm _pyfact', t[0:20]
-        #print 'start_pyfact: ', self.start_cells[0]
-        #print 'acal _pyfact: ', self.acal_data[0,0:10] 
-        #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)
+        
+        #print 'blm _pyfact', blm[0,0:20] 
+        #t = np.roll( blm[0,:], -self.start_cells[0] )
+        #print 'blm _pyfact', t[0:20]
+        #print 'start_pyfact: ', self.start_cells[0]
+        #print 'acal _pyfact: ', self.acal_data[0,0:10] 
+        #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)