--- DarthVader/CalorimeterLevel2/inc/CaloLevel1.h 2007/03/28 13:35:11 1.5 +++ DarthVader/CalorimeterLevel2/inc/CaloLevel1.h 2007/03/30 14:37:42 1.7 @@ -77,9 +77,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,15 +102,16 @@ 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. @@ -129,9 +130,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] //