--- DarthVader/CalorimeterLevel2/inc/CaloLevel1.h	2007/07/20 08:24:51	1.10
+++ DarthVader/CalorimeterLevel2/inc/CaloLevel1.h	2007/12/05 09:51:29	1.15
@@ -22,9 +22,15 @@
 //
 // new param using em showers (E. Taddei paramters)
 //
+//#define CTX 120.6
+//#define CTY 122.3 
+//#define CTZ -263.1
+//
+// new param using inclined protons and looking for Z alignment
+//
 #define CTX 120.6
 #define CTY 122.3 
-#define CTZ -263.1
+#define CTZ -261.596
 //
 // Mechanical positions (used with option --use-standard-alig)
 //
@@ -78,10 +84,13 @@
     //
     Float_t GetEstrip(Int_t view, Int_t plane, Int_t strip); ///< returns saved MIP value for the indicated strip.
     Float_t DecodeEstrip(Int_t entry, Int_t &view, Int_t &plane, Int_t &strip); ///< returns saved MIP value for the entry number "entry" of the TArrayI.
+    Float_t DecodeEstrip(Int_t entry, Int_t &view, Int_t &plane, Int_t &strip, Bool_t &saturated); ///< returns saved MIP value for the entry number "entry" of the TArrayI.
     Float_t qtotpl(Int_t nplane); ///< Returns energy released on plane nplane (where 0<= nplane <= 43, 0 = 1Y, 1 = 1X, 2 = 2Y, 3 = 2X, etc. etc.).
     Float_t qtotpl(Int_t view, Int_t plane); ///< Returns energy released on view "view" (0 = X, 1 = Y) and plane "plane" ( 0 <= plane <= 21 ).
+    Float_t qtotpl(Int_t nplane, Bool_t &saturation); ///< Returns energy released on plane nplane (where 0<= nplane <= 43, 0 = 1Y, 1 = 1X, 2 = 2Y, 3 = 2X, etc. etc.).
+    Float_t qtotpl(Int_t view, Int_t plane, Bool_t &saturation); ///< Returns energy released on view "view" (0 = X, 1 = Y) and plane "plane" ( 0 <= plane <= 21 ).
     //
-    void Clear();
+    void Clear(Option_t *t="");
     //
     Float_t GetXalig(){printf(" Obsolete! Use CaloStrip class instead\n");return CTX;}; ///< return X alignement paramenter
     Float_t GetYalig(){printf(" Obsolete! Use CaloStrip class instead\n");return CTY;}; ///< return Y alignement paramenter
@@ -149,7 +158,7 @@
     void SetAlig(Float_t XALIG, Float_t YALIG, Float_t ZALIG){ ismech = false; UXal = XALIG; UYal = YALIG; UZal = ZALIG;};///< User defined alignement parameters
     Bool_t IsMechanicalAlig(){return ismech;}; ///< True is using mechanical alignement parameters, false otherwise
     //
-    void Clear(); ///< clear variables
+    void Clear(Option_t *t=""); ///< clear variables
     //
     CaloStrip* GetCaloStrip(){return this;}; ///< returns pointer to this object
     //