--- DarthVader/CalorimeterLevel2/inc/CaloLevel2.h	2007/03/18 20:22:52	1.14
+++ DarthVader/CalorimeterLevel2/inc/CaloLevel2.h	2009/09/28 17:06:40	1.21
@@ -9,6 +9,8 @@
 #include <TClonesArray.h>
 #include <TArrayI.h>
 //
+#include <math.h>
+//
 #include <CaloStruct.h>
 //
 
@@ -61,7 +63,7 @@
      */
     CaloTrkVar(const CaloTrkVar &trkvar); ///< copy values from trkvar to this
     //
-    void Clear(); ///< clear variables
+    void Clear(Option_t *t=""); ///< clear variables
     CaloTrkVar* GetCaloTrkVar(){return this;}; ///< returns pointer to this object
     //
     ClassDef(CaloTrkVar,2);
@@ -86,13 +88,15 @@
     Int_t perr[4]; ///< processing errors (one for each calorimeter section)
     Int_t swerr[4];///< DSP status word 
     Int_t crc[4];  ///< CRC errors on data
-    Int_t selftrigger;///< self-trigger flag (1 selftrigger event, 0 normal event)
+    Int_t selftrigger;///< self-trigger flag: 0 tof trigger, 2 selftrigger event, 3 selftrigger + tof trigger, 102 selftrigger event not stored in the selfdelay array  NB: selftrigger == S4 trigger || no trigger || calo trigger in the triggerconf array
     //
     // common variables (not related to tracks)
     //
     Int_t nstrip;      ///< total number of strip hit
+    Int_t nsatstrip;   ///< total number of strip hit with saturated signal
     Int_t nx22;        ///< number of strip hit in the last silicon plane of the calorimeter (x view number 22)
     Int_t planemax[2]; ///< plane of maximum energy release (x and y)
+    Int_t selfdelay[4][7]; ///< Delay of the selftrigger planes + coincidence for every section
     Float_t qtot;      ///< total energy detected (MIP)
     Float_t qx22;      ///< energy detected in the last silicon plane of the calorimeter (x view number 22)
     Float_t qmax;      ///< the maximum energy detected in a strip
@@ -126,15 +130,17 @@
     void GetElectronEnergy(Float_t &energy, Float_t &sigma); ///< returns energy and sigma using qtot and assuming the particle being an electron
     //
     CaloTrkVar *GetCaloTrkVar(Int_t notrack);  ///< returns a pointer to the CaloTrkVar class containing track related variables for track number notrack
+    CaloTrkVar* GetCaloStoredTrack(Int_t seqno); ///< returns pointer to the track set related to the seqno number
     //
     TClonesArray *GetTrackArray(){return CaloTrk;}; ///< returns a pointer to the track related variables array
     CaloLevel2* GetCaloLevel2(){return this;}; ///< returns pointer to this object
     //
     void GetLevel2Struct(cCaloLevel2 *l2) const;
     //
-    void Clear();
-    void Delete(); //ELENA
+    void Clear(Option_t *t="");
+    void Delete(Option_t *t=""); //ELENA
     void Set(); //ELENA
+    Bool_t IsGood(Bool_t strict = false); // method to check if the event is good or not
     //
     // constructor
     //
@@ -143,7 +149,7 @@
     //
     friend class CaloLevel0;
     //
-    ClassDef(CaloLevel2,4);
+    ClassDef(CaloLevel2,6);
 };
 
 #endif