--- DarthVader/CalorimeterLevel2/inc/CaloLevel1.h	2007/04/26 14:24:37	1.9
+++ DarthVader/CalorimeterLevel2/inc/CaloLevel1.h	2011/09/02 14:49:02	1.17
@@ -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)
 //
@@ -73,19 +79,22 @@
     //
     TArrayI estrip; ///< MIP values for each strip with energy > emin coded with view plane and strip number. NOTICE: precision is limited to the 5 most significative ciphers
     //
-    CaloLevel1* GetCaloLevel1(){return this;}; ///< returns pointer to this object
+    CaloLevel1* GetCaloLevel1(){return this;} ///< returns pointer to this object
     //
     //
     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
-    Float_t GetZalig(){printf(" Obsolete! Use CaloStrip class instead\n");return CTZ;}; ///< return Z alignement paramenter
+    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
+    Float_t GetZalig(){printf(" Obsolete! Use CaloStrip class instead\n");return CTZ;} ///< return Z alignement paramenter
     //
     CaloLevel1(); ///< Constructor.
     //
@@ -126,32 +135,34 @@
     //
     CaloStrip(CaloLevel1 *c1, Bool_t usemechanicalalignement); ///< Constructor.
     //
-    Float_t GetE(){return fE;}; ///< Get energy in MIP for setted strip
+    Float_t GetE(){return fE;} ///< Get energy in MIP for setted strip
+    //
+    Float_t GetX(){return fX;} ///< Get X strip position
+    Float_t GetY(){return fY;} ///< Get Y strip position
+    Float_t GetZ(){return fZ;} /// Get Z strip position
+    //
+    Float_t GetXalig(){ return UXal;} ///< return X alignement paramenter
+    Float_t GetYalig(){ return UYal;} ///< return Y alignement paramenter
+    Float_t GetZalig(){ return UZal;} ///< return Z alignement paramenter
+    //
+    Int_t GetView(){return (fView-1);} ///< Get strip view [0-1]
+    Int_t GetPlane(){return (fPlane-1);} ///< Get strip plane [0-21]
+    Int_t GetStrip(){return (fStrip-1);} ///< Get strip number [0-95]
     //
-    Float_t GetX(){return fX;}; ///< Get X strip position
-    Float_t GetY(){return fY;}; ///< Get Y strip position
-    Float_t GetZ(){return fZ;}; /// Get Z strip position
-    //
-    Float_t GetXalig(){ return UXal;}; ///< return X alignement paramenter
-    Float_t GetYalig(){ return UYal;}; ///< return Y alignement paramenter
-    Float_t GetZalig(){ return UZal;}; ///< return Z alignement paramenter
-    //
-    Int_t GetView(){return (fView-1);}; ///< Get strip view [0-1]
-    Int_t GetPlane(){return (fPlane-1);}; ///< Get strip plane [0-22]
-    Int_t GetStrip(){return (fStrip-1);}; ///< Get strip number [0-95]
+    Int_t GetSiSensor(); ///< Return the sensor number, -1 means dead area
     //
     void Set(Int_t view, Int_t plane, Int_t strip); ///< Set strip giving view [0-1], plane [0-22] and number [0-95]
     //
     void Set(Float_t X, Float_t Y, Float_t Z); ///< Set strip giving position in PAMELA ref sys [cm]
     //
-    void UseMechanicalAlig(){ ismech = true; UXal = MECHCTX; UYal = MECHCTY; UZal = MECHCTZ;}; ///< Tells CaloStrip to use mechanical alignement parameters
+    void UseMechanicalAlig(){ ismech = true; UXal = MECHCTX; UYal = MECHCTY; UZal = MECHCTZ;} ///< Tells CaloStrip to use mechanical alignement parameters
     void UseStandardAlig(); ///< Tells CaloStrip to use default parameters it will find querying the DB. If connection fails uses parameters hard-coded in this file 
-    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 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
+    CaloStrip* GetCaloStrip(){return this;} ///< returns pointer to this object
     //
     ClassDef(CaloStrip,2);
     //