--- DarthVader/CalorimeterLevel2/inc/CaloLevel1.h	2007/03/26 14:02:03	1.4
+++ DarthVader/CalorimeterLevel2/inc/CaloLevel1.h	2007/04/20 11:17:46	1.8
@@ -16,8 +16,14 @@
 //
 // new param
 //
-#define CTX 121.2
-#define CTY 122.9 
+//#define CTX 121.2
+//#define CTY 122.9 
+//#define CTZ -263.1
+//
+// new param using em showers (E. Taddei paramters)
+//
+#define CTX 120.6
+#define CTY 122.3 
 #define CTZ -263.1
 //
 // Mechanical positions (used with option --use-standard-alig)
@@ -77,9 +83,9 @@
     //
     void Clear();
     //
-    Float_t GetXalig(){return CTX;}; ///< return X alignement paramenter
-    Float_t GetYalig(){return CTY;}; ///< return Y alignement paramenter
-    Float_t GetZalig(){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.
     //
@@ -102,19 +108,24 @@
     Int_t fPlane; ///< plane [1-22]
     Int_t fStrip; ///< strip [1-96]
     Bool_t ismech; ///< true = using mechanical alignement, false using experimental alignement parameters
-    Float_t UXal; ///< used X alignement parameter
-    Float_t UYal; ///< used Y alignement parameter
-    Float_t UZal; ///< used Z alignement parameter
+    static Float_t UXal; ///< used X alignement parameter
+    static Float_t UYal; ///< used Y alignement parameter
+    static Float_t UZal; ///< used Z alignement parameter
+    static Bool_t paramload;
+   //
 
 public:
     //
     // METHODS
     //
-    //
     CaloStrip(); ///< Default Constructor.
     //
+    CaloStrip(Bool_t usemechanicalalignement); ///< Default Constructor.
+    //
     CaloStrip(CaloLevel1 *c1); ///< Constructor.
     //
+    CaloStrip(CaloLevel1 *c1, Bool_t usemechanicalalignement); ///< Constructor.
+    //
     Float_t GetE(){return fE;}; ///< Get energy in MIP for setted strip
     //
     Float_t GetX(){return fX;}; ///< Get X strip position
@@ -125,9 +136,9 @@
     Float_t GetYalig(){ return UYal;}; ///< return Y alignement paramenter
     Float_t GetZalig(){ return UZal;}; ///< return Z alignement paramenter
     //
-    Int_t GetView(){printf(" Obsolete! Use CaloStrip class instead\n"); return (fView-1);}; ///< Get strip view [0-1]
-    Int_t GetPlane(){printf(" Obsolete! Use CaloStrip class instead\n");return (fPlane-1);}; ///< Get strip plane [0-22]
-    Int_t GetStrip(){printf(" Obsolete! Use CaloStrip class instead\n");return (fStrip-1);}; ///< Get strip number [0-95]
+    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]
     //
     void Set(Int_t view, Int_t plane, Int_t strip); ///< Set strip giving view [0-1], plane [0-22] and number [0-95]
     //