Correction of SA track rejection

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALShishKebabTrd1Module.h

diff --git a/EMCAL/AliEMCALShishKebabTrd1Module.h b/EMCAL/AliEMCALShishKebabTrd1Module.h
index 859ae44ba772e47197e964b48a47940555136195..c428328006a4b404e0bb247f85044916f9c4b3a0 100644 (file)
--- a/EMCAL/AliEMCALShishKebabTrd1Module.h
+++ b/EMCAL/AliEMCALShishKebabTrd1Module.h
@@ -14,11 +14,11 @@
 #include <TMath.h>
 #include <TVector2.h>
 
-class AliEMCALGeometry;
+class AliEMCALEMCGeometry;
 
 class AliEMCALShishKebabTrd1Module : public TNamed {
  public:
-  AliEMCALShishKebabTrd1Module(Double_t theta=0.0, AliEMCALGeometry *g=0);
+  AliEMCALShishKebabTrd1Module(Double_t theta=0.0, AliEMCALEMCGeometry *g=0);
   AliEMCALShishKebabTrd1Module(AliEMCALShishKebabTrd1Module &leftNeighbor);
   void Init(Double_t A, Double_t B);
   void DefineAllStaff();
@@ -43,6 +43,8 @@ class AliEMCALShishKebabTrd1Module : public TNamed {
   Double_t  GetA() const {return fA;}
   Double_t  GetB() const {return fB;}
   Double_t  GetRadius() const {return fgr;}
+  TVector2  GetORB() const {return fORB;}
+  TVector2  GetORT() const {return fORT;}
   //  Additional offline staff 
   //  ieta=0 or 1 - Jun 02, 2006
   TVector2& GetCenterOfCellInLocalCoordinateofSM(Int_t ieta)
@@ -54,16 +56,14 @@ class AliEMCALShishKebabTrd1Module : public TNamed {
     } else      {xr = fOK1.Y(); zr = fOK1.X();
     }
   }
-  void GetCenterOfCellInLocalCoordinateofSM_3X3(Int_t ieta, Double_t &xr, Double_t &zr) const
+  void GetCenterOfCellInLocalCoordinateofSM3X3(Int_t ieta, Double_t &xr, Double_t &zr) const
   { // 3X3 case - Nov 9,2006
-    ieta = ieta<0? ieta=0 : ieta; // check index
-    ieta = ieta>2? ieta=2 : ieta;
-    xr   = fOK3X3[2-ieta].Y();
-    zr   = fOK3X3[2-ieta].X();
+    if(ieta < 0) ieta = 0; //ieta = ieta<0? ieta=0 : ieta; // check index
+    if(ieta > 2) ieta = 2; //ieta = ieta>2? ieta=2 : ieta;
+    xr   = fOK3X3[2-ieta].Y(); zr   = fOK3X3[2-ieta].X();
   }
-  void GetCenterOfCellInLocalCoordinateofSM_1X1(Double_t &xr, Double_t &zr) const
-  { // 1X1 case - Nov 27,2006
-    // Center of cell is center of module
+  void GetCenterOfCellInLocalCoordinateofSM1X1(Double_t &xr, Double_t &zr) const
+  { // 1X1 case - Nov 27,2006 // Center of cell is center of module
     xr   = fOK.Y() - fgr;
     zr   = fOK.X();
   }
@@ -88,7 +88,7 @@ class AliEMCALShishKebabTrd1Module : public TNamed {
 
  protected:
   // geometry info
-  static AliEMCALGeometry *fgGeometry; //!
+  static AliEMCALEMCGeometry *fgGeometry; //!
   static Double_t fga;        // 2*dx1=2*dy1
   static Double_t fga2;       // 2*dx2
   static Double_t fgb;        // 2*dz1
@@ -114,8 +114,11 @@ class AliEMCALShishKebabTrd1Module : public TNamed {
   Double_t fThetaOB2;  // theta of cell center line (go through OB2)
   // 3X3 case - Nov 9,2006
   TVector2 fOK3X3[3];
+  // Apr 14, 2010 - checking of geometry
+  TVector2 fORB; // position of right/bottom point of module
+  TVector2 fORT; // position of right/top    point of module
   // public:
-  ClassDef(AliEMCALShishKebabTrd1Module,2) // TRD1 Shish-Kebab module 
+  ClassDef(AliEMCALShishKebabTrd1Module, 4) // TRD1 Shish-Kebab module 
 };
 
 #endif