--- calo/flight/CaloEnergy/inc/CaloEnergy.h	2009/08/11 13:28:27	1.6
+++ calo/flight/CaloEnergy/inc/CaloEnergy.h	2009/08/18 09:24:50	1.9
@@ -105,6 +105,9 @@
     Float_t ye5; ///< position of strip 65 section YE
     Float_t ye6; ///< position of strip 96 section YE
     //    Float_t z4;
+    Float_t  track_coordx[22][2];
+    Float_t  track_coordy[22][2];
+    //
     Float_t trk_z[22][2]; ///< Z position of calorimeter planes
     Float_t en; ///< energy [mip] for decodeestrip
     Int_t view; ///< view for decodeestrip
@@ -121,6 +124,9 @@
     Float_t en_xop[11]; ///< detected energy [MIP] for each plane of section XO
     Float_t en_yep[11]; ///< detected energy [MIP] for each plane of section YE
     Float_t enstrip[2][22][96]; ///< detected energy [MIP] for each strip of calorimeter
+    //
+    Float_t encol[2][3];
+    Int_t fColumn;
     // 
     Float_t x0max; ///< plane of maximum given externally (only test purpose)
     //
@@ -194,9 +200,9 @@
     CaloLong* GetCaloLong(){return clong;}; ///< Get calolong object.
     void UseMeasuredEnergyUpToMax(){ fLong = false;}; ///< use the measured energy to determine the maximum (default)
     //
-    void SetMargin(Float_t margin){fM = margin + 0.096; fM1 = margin - 0.122 - 0.096; if ( fM1 < 0. ) fM1 = 0.;}; ///< set the margin from the border of the silicon sensor (not from the first strip), set the same margin for both the directions
-    void SetMarginStripDirection(Float_t margin){fM = margin + 0.096;}; ///< set the margin from the border of the silicon sensor (not from the first strip) in the strip direction
-    void SetMarginStripReading(Float_t margin){fM1 = margin -0.122 - 0.096;};  ///< set the margin from the border of the silicon sensor (not from the first strip) in the strip reading direction
+    void SetMargin(Float_t margin){fM = margin ; fM1 = margin - 0.122 - 0.096 + 0.096; if ( fM1 < 0. ) fM1 = 0.;}; ///< set the margin from the border of the silicon sensor (not from the first strip), set the same margin for both the directions
+    void SetMarginStripDirection(Float_t margin){fM = margin ;}; ///< set the margin from the border of the silicon sensor (not from the first strip) in the strip direction
+    void SetMarginStripReading(Float_t margin){fM1 = margin -0.122 - 0.096 + 0.096;};  ///< set the margin from the border of the silicon sensor (not from the first strip) in the strip reading direction
     void SetRadius(Int_t strip){fRad = strip;}; ///< set the radius of the cylinder
     void SetMaxPlaneOffset(Int_t noplanes){fPl = noplanes;}; ///< set the number of dE/dx measurements to be used after the maximum
     void SetX0max(Float_t xm){ x0max = xm;}; ///< set the plane of maximum from external source X0 (test purpose only)
@@ -216,6 +222,17 @@
     void UseCaloPreSampler(); ///< use pre-sampler routine to refit the track (level2 default fitting could be wrong, in this case we force "shower fitting" in the DV library).
     CaloPreSampler* GetCaloPreSampler(){return cp;}; ///< Get pre-sampler object.
     //
+    Float_t *Get_track_coordx(){ return *track_coordx;}; ///< X position of the track for all the planes and views
+    Float_t *Get_track_coordy(){ return *track_coordy;}; ///< Y position of the track for all the planes and views
+    //
+    Float_t  Get_track_coordx(Int_t i, Int_t j){ return track_coordx[i][j];}; ///< X position of the track for plane i and view j
+    Float_t  Get_track_coordy(Int_t i, Int_t j){ return track_coordy[i][j];}; ///< X position of the track for plane i and view j
+    //
+    Float_t *Get_encol(){ return *encol;}; ///< integrated energy over columns [MIP]
+    Float_t Get_encol(Int_t i, Int_t j){ return encol[i][j];}; ///< integrated energy over view i and column j [MIP]
+    //
+    Int_t Get_column(){return fColumn;}; ///< number of column which contains the track
+    //
     ClassDef(CaloEnergy,1);
 };