Changeset 13644

Timestamp:

05/11/12 06:49:17 (13 years ago)

Author:

neise

Message:

RawData.board_times and RawData.start_cells are now numpy array. They were of type ROOT.PyShortBuffer before, which is not so easy to handle.
Since it is not time critical, I decided to create them this way.

RawData.info() is not giving a sufficient amount of info, I think.
should be reworked.

A RawData object has several member, which make no sense in all cases.
E.g. some members related to the baseline correction. 
These members should only exist, in case the user wants to perform baseline correction.

File:

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

fact/tools/pyscripts/pyfact/pyfact.py

@@ -143 +143 @@
             self.event_id     = None
             self.trigger_type = None
-            self.start_cells  = None
-            self.board_times  = None
+            #self.start_cells  = None
+            #self.board_times  = None
+            self.start_cells = np.zeros( self.npix, np.int16 )
+            self.board_times = np.zeros( 40, np.int32 )
+
+            # data_file             is a CalFactFits object
+            # data_file.datafile    is one of the two FactFits objects hold by a CalFactFits. 
+            #       sorry for the strange naming .. 
+            data_file.datafile.SetPtrAddress('StartCellData', self.start_cells)
+            data_file.datafile.SetPtrAddress('BoardTime', self.board_times)
 
         else:
@@ -225 +233 @@
                 self.event_id     = self.data_file.event_id
                 self.trigger_type = self.data_file.event_triggertype
-                self.start_cells  = self.data_file.event_offset
-                self.board_times  = self.data_file.event_boardtimes
+                #self.start_cells  = self.data_file.event_offset
+                #self.board_times  = self.data_file.event_boardtimes
                 #self.acal_data    = self.data.copy().reshape(self.data_file.npix, self.data_file.nroi)
         else:
@@ -319 +327 @@
         
         """
-        
-        print 'data file:  ', data_file_name
-        print 'calib file: ', calib_file_name
-        print 'calibration file'
-        print 'N baseline_mean: ', self.Nblm
-        print 'N gain mean: ', self.Ngm
-        print 'N TriggeroffsetMean: ', self.Ntom
-        
+        print 'data file:  ', self.data_file_name
+        print 'calib file: ', self.calib_file_name
+        print '... we need more information printed here ... '
+
 # -----------------------------------------------------------------------------
 class RawDataFake( object ):