--- DarthVader/CalorimeterLevel2/inc/CaloLevel0.h	2008/05/12 14:36:02	1.9
+++ DarthVader/CalorimeterLevel2/inc/CaloLevel0.h	2008/06/19 20:01:31	1.10
@@ -36,6 +36,7 @@
     Bool_t verbose; ///< verbose flag
     Bool_t crosst; ///< Cross talk correction flag (true apply false do not apply)
     Bool_t ctground; ///< Cross talk correction type (true ground, false flight)
+    Bool_t noselfct; ///< Pre cross talk correction do not applied to the strip itself
     //
     // variables in which it is stored the calibration information for the four sections
     //
@@ -75,8 +76,10 @@
     Float_t dexyc[2][22][96]; ///< RAW ADC data
     Float_t base[2][22][6]; ///< baselines for this event
     Float_t sbase[2][22][6]; ///< saved baselines from previous events
-    Float_t ctprecor[2][22][6]; ///< 'cross-talk' correction factor for each pre from pulse calibration
-    Float_t ctneigcor[2][22][6]; ///< 'cross-talk' correction factor for each pre, neighbour strips from pulse calibration
+    Float_t ctprecor[2][22][6]; ///< 'cross-talk' correction factor for each pre from pulse calibration or table file
+    Float_t ctneigcor[2][22][6]; ///< 'cross-talk' correction factor for each pre, neighbour strips from pulse calibration or table file
+    Float_t ctsicor[2][22][9]; ///< 'cross-talk' correction factor for each silicon detector
+    Int_t maxrms[2][22]; ///< max rms for each plane, strip with higher values are masked
     //
     // Energy vector
     //
@@ -88,12 +91,18 @@
     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
+    Bool_t calopar4; ///< boolean, is true if parameter set number 103 has already been loaded
+    Bool_t calopar5; ///< 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
+    UInt_t ftcalopar4; ///< parameter set 103 lower limit validity
+    UInt_t ttcalopar4; ///< parameter set 103 upper limit validity
+    UInt_t ftcalopar5; ///< parameter set 103 lower limit validity
+    UInt_t ttcalopar5; ///< parameter set 103 upper limit validity
     //
     void ClearCalibVals(Int_t s); ///< clear calibration values for section s
     void ClearCommonVar(); ///< clear common variables
@@ -112,6 +121,7 @@
     Int_t obadmask[2][22][96]; ///< Offline mask of bad strips (not used to calculate baselines and calorimeter variables)	
     Int_t obadpulsemask[2][22][96]; ///< Offline mask of bad pulser (not used to calculate crosstalk corrections)	
     Float_t emin; ///< Offline threshold to separate noise from signal
+    Float_t memin[2][22][96]; ///< Offline threshold to separate noise from signal
     //
     // Structures to pass data from/to F77
     //
@@ -130,7 +140,9 @@
     Int_t ChkCalib(GL_TABLES *glt, UInt_t atime); ///< check and load calibration data
     Int_t CalcCrossTalkCorr(GL_TABLES *glt, UInt_t runheader); ///< calculate the cross talk corretion using CaloPulse information from flight calibrations
     Int_t CalcCrossTalkCorr(TSQLServer *dbc, UInt_t runheader); ///< calculate the cross talk corretion using CaloPulse information from flight calibrations
-    Int_t CalcCrossTalkCorrDo(TSQLServer *dbc, UInt_t runheader); ///< calculate the cross talk corretion using CaloPulse information from flight calibrations
+    Int_t CalcCrossTalkCorr(GL_TABLES *glt, UInt_t runheader, Bool_t usetable); ///< calculate the cross talk corretion using CaloPulse information from flight calibrations
+    Int_t CalcCrossTalkCorr(TSQLServer *dbc, UInt_t runheader, Bool_t usetable); ///< calculate the cross talk corretion using CaloPulse information from flight calibrations
+    Int_t CalcCrossTalkCorrDo(TSQLServer *dbc, UInt_t runheader, Bool_t usetable); ///< calculate the cross talk corretion using CaloPulse information from flight calibrations
     Int_t Calibrate(Int_t ei); ///< perform data calibration
     void GetCommonVar(); ///< call fortran common variables program
     void GetTrkVar(); ///< call fortran track-related variables program
@@ -140,11 +152,13 @@
     void RunClose(); ///< clear variables which could change from one run to another
     void SetCrossTalk(Bool_t ct);
     void SetCrossTalkType(Bool_t ct);
+    void SetCrossTalkType(Int_t ct);
     void SetVerbose(Bool_t ct);
     //
     // constructor
     //
     CaloLevel0(); ///< contructor
+    void Delete(Option_t *t=""); //ELENA
     void ProcessingInit(GL_TABLES *glt, UInt_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
     void InitDo(TSQLServer *dbc, UInt_t hs, Int_t &sgnl, TTree *l0tree, Bool_t debug, Bool_t verbose); ///< initialize caloprocessing object
@@ -153,7 +167,7 @@
     //
     ~CaloLevel0();///< destructor
     //
-    ClassDef(CaloLevel0,3);
+    ClassDef(CaloLevel0,4);
 };
 
 #endif