--- DarthVader/CalorimeterLevel2/inc/CaloProcessing.h	2006/09/06 11:03:29	1.3
+++ DarthVader/CalorimeterLevel2/inc/CaloProcessing.h	2006/11/22 08:31:09	1.5
@@ -14,6 +14,7 @@
 #include <CalibCalPedEvent.h>
 //
 #include <CaloCore.h>
+#include <CaloLevel1.h>
 #include <CaloLevel2.h>
 
 /**
@@ -64,16 +65,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
-    UInt_t ftcalopar1; ///< parameter set 1 lower limit validity
-    UInt_t ttcalopar1; ///< parameter set 1 upper limit validity
-    UInt_t ftcalopar2; ///< parameter set 2 lower limit validity
-    UInt_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
     //
@@ -92,6 +96,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
@@ -111,7 +116,7 @@
     void GetCommonVar(); ///< call fortran common variables program
     void GetTrkVar(); ///< call fortran track-related variables program
     void ClearStructs(); ///< clear input and output structures 
-    void FillCommonVar(CaloLevel2 *ca); ///< copy common variables from structure to class
+    void FillCommonVar(CaloLevel1 *c1, CaloLevel2 *ca); ///< copy common variables from structure to class
     void FillTrkVar(CaloLevel2 *ca, Int_t nutrk); ///< copy track-related variables from structure to class
     void RunClose(); ///< clear variables which could change from one run to another
     //