--- DarthVader/CalorimeterLevel2/inc/CaloProcessing.h	2006/08/04 10:31:25	1.2
+++ DarthVader/CalorimeterLevel2/inc/CaloProcessing.h	2006/11/14 14:08:49	1.4
@@ -10,7 +10,6 @@
 // YODA headers
 //
 #include <PamelaRun.h>
-#include <RegistryEvent.h>
 #include <physics/calorimeter/CalorimeterEvent.h>
 #include <CalibCalPedEvent.h>
 //
@@ -31,9 +30,9 @@
     //
     // variables in which it is stored the calibration information for the four sections
     //
-    ULong64_t idcalib[4]; ///< ID of root file containing calibrations (one per section)
-    ULong64_t fromtime[4]; ///< lower validity time limit
-    ULong64_t totime[4]; ///< upper validity time limit
+    UInt_t idcalib[4]; ///< ID of root file containing calibrations (one per section)
+    UInt_t fromtime[4]; ///< lower validity time limit
+    UInt_t totime[4]; ///< upper validity time limit
     Int_t calibno[4]; ///< entry of the file
     TString fcalname[4]; ///< filename of calibrations
     //
@@ -65,16 +64,19 @@
     // Energy vector
     //
     Int_t istrip; ///< number of strip above threshold
-    Float_t svstrip[4224]; ///< saved calibrated energy
+    Int_t svstrip[4224]; ///< saved calibrated energy
     //
     // Variables needed to handle parameters files
     //
-    Bool_t calopar1; ///< boolean, is true if parameter set number 1 has already been loaded
-    Bool_t calopar2; ///< boolean, is true if parameter set number 2 has already been loaded
-    ULong64_t ftcalopar1; ///< parameter set 1 lower limit validity
-    ULong64_t ttcalopar1; ///< parameter set 1 upper limit validity
-    ULong64_t ftcalopar2; ///< parameter set 2 lower limit validity
-    ULong64_t ttcalopar2; ///< parameter set 2 upper limit validity
+    Bool_t calopar1; ///< boolean, is true if parameter set number 101 has already been loaded
+    Bool_t calopar2; ///< boolean, is true if parameter set number 102 has already been loaded
+    Bool_t calopar3; ///< boolean, is true if parameter set number 103 has already been loaded
+    UInt_t ftcalopar1; ///< parameter set 101 lower limit validity
+    UInt_t ttcalopar1; ///< parameter set 101 upper limit validity
+    UInt_t ftcalopar2; ///< parameter set 102 lower limit validity
+    UInt_t ttcalopar2; ///< parameter set 102 upper limit validity
+    UInt_t ftcalopar3; ///< parameter set 103 lower limit validity
+    UInt_t ttcalopar3; ///< parameter set 103 upper limit validity
     //
     // private methods
     //
@@ -85,7 +87,7 @@
     void ClearCommonVar(); ///< clear common variables
     void ClearTrkVar();  ///< clear track-related variables
     void FindBaseRaw(Int_t l, Int_t m, Int_t pre); ///< calculate baselines starting from RAW data
-    Int_t Update(TSQLServer *dbc, ULong64_t atime, Int_t s); ///< update calibration for this event
+    Int_t Update(TSQLServer *dbc, UInt_t atime, Int_t s); ///< update calibration for this event
     Int_t LoadCalib(Int_t s); ///< load calibrations
 
  public:
@@ -93,6 +95,7 @@
     // ADC to MIP conversion values
     //
     Float_t mip[2][22][96]; ///< ADC to MIP conversion values
+    Int_t obadmask[2][22][96]; ///< Offline mask of bad strips (not used to calculate baselines and calorimeter variables)	
     Float_t emin; ///< Offline threshold to separate noise from signal
     //
     // Structures to pass data from/to F77
@@ -106,8 +109,8 @@
     //
     // useful methods
     //
-    Int_t ChkParam(TSQLServer *dbc, ULong64_t runheader); ///< check and load parameters data
-    Int_t ChkCalib(TSQLServer *dbc, ULong64_t atime); ///< check and load calibration data
+    Int_t ChkParam(TSQLServer *dbc, UInt_t runheader); ///< check and load parameters data
+    Int_t ChkCalib(TSQLServer *dbc, UInt_t atime); ///< check and load calibration data
     Int_t Calibrate(Int_t ei); ///< perform data calibration
     void GetCommonVar(); ///< call fortran common variables program
     void GetTrkVar(); ///< call fortran track-related variables program
@@ -119,11 +122,11 @@
     // constructor
     //
     CaloProcessing(); ///< contructor
-    void ProcessingInit(TSQLServer *dbc, ULong64_t hs, Int_t &sgnl, TTree *l0tree, Bool_t debug, Bool_t verbose); ///< initialize caloprocessing object
+    void ProcessingInit(TSQLServer *dbc, UInt_t hs, Int_t &sgnl, TTree *l0tree, Bool_t debug, Bool_t verbose); ///< initialize caloprocessing object
     //
     // virtual destructor
     //
-    virtual ~CaloProcessing();
+    virtual ~CaloProcessing();///< virtual destructor
     //
 };