--- calo/flight/CaloEnergy/inc/CaloEnergy.h	2009/06/29 09:42:10	1.1.1.1
+++ calo/flight/CaloEnergy/inc/CaloEnergy.h	2009/07/10 09:54:32	1.2
@@ -44,13 +44,24 @@
     //
     Float_t fM;
     Float_t fM1;
-    Float_t fPl;
-    Float_t fConv_r;
+    Int_t fPl;
+    Float_t fConv_rxe;
+    Float_t fConv_rxo;
+    Float_t fConv_rye;
+    Float_t fConv_ryo;
     Bool_t fLong;
     //
+    Float_t fEnergyxe;
+    Float_t fEnergyxo;
+    Float_t fEnergyye;
+    Float_t fEnergyyo;
     Float_t fEnergy;
     Float_t fCount;
-    Int_t fMax_plane;
+    Int_t fMax_planexe;
+    Int_t fMax_planexo;
+    Int_t fMax_planeyo;
+    Int_t fMax_planeye;
+    Float_t fMax_plane;
     //
     Float_t xe1;
     Float_t xe2;
@@ -85,6 +96,7 @@
     Int_t view;
     Int_t plane;
     Int_t strip;
+    Int_t fRad;
     Float_t energyxe; 
     Float_t energyyo; 
     Float_t energyxo; 
@@ -139,12 +151,20 @@
     Float_t GetEnergy(TString section){ Process(section); return fEnergy;};
     Float_t GetCount(){ return fCount;};
     //
+    Float_t GetMaxplane(){ return fMax_plane;};
+    Float_t GetMaxEnergy(TString section){ return(this->GetEnergy(section)*this->GetConversionFactor(section));};
+    Int_t GetMaxplane(TString section);
+    //
     void UseLongitudinalFitEnergy(){ fPl = 0; fLong = true;};
     void UseMeasuredEnergyUpToMax(){ fLong = false;};
-    void SetMargin(Float_t margin){fM = margin; fM1 = fM - 0.122 -0.096; if ( fM1 < 0. ) fM1 = 0.;};
+    void SetMargin(Float_t margin){fM = margin + 0.096; fM1 = margin - 0.122 - 0.096; if ( fM1 < 0. ) fM1 = 0.;};
+    void SetMarginStripDirection(Float_t margin){fM = margin + 0.096;};
+    void SetMarginStripReading(Float_t margin){fM1 = margin -0.122 - 0.096;};
+    void SetRadius(Int_t strip){fRad = strip;};
     void SetMaxPlaneOffset(Int_t noplanes){fPl = noplanes;};
     //
-    void SetConversionFactor(Float_t conv_r){ fConv_r = conv_r;};
+    void SetConversionFactor(TString section, Float_t conv_r);
+    Float_t GetConversionFactor(TString section);
     //
     ClassDef(CaloEnergy,1);
 };