Correction for actual vertex position implemented

[u/mrichter/AliRoot.git] / PHOS / AliPHOSGeometry.h

diff --git a/PHOS/AliPHOSGeometry.h b/PHOS/AliPHOSGeometry.h
index fa6e3893af871d141052916a6d31c54d414d6b17..98e1b9a38356825a98f5239af958bb8af5335f26 100644 (file)
--- a/PHOS/AliPHOSGeometry.h
+++ b/PHOS/AliPHOSGeometry.h
@@ -31,20 +31,20 @@ class AliPHOSGeometry : public AliGeometry {
 public: 
 
   AliPHOSGeometry() ;
-
-  AliPHOSGeometry(const AliPHOSGeometry & geom) : AliGeometry(geom) {
-    Fatal("cpy ctor", "not implemented") ; 
-  } 
+  AliPHOSGeometry(const AliPHOSGeometry & geom) ;
   
   virtual ~AliPHOSGeometry(void) ; 
   static AliPHOSGeometry * GetInstance(const Text_t* name, const Text_t* title="") ; 
   static AliPHOSGeometry * GetInstance() ; 
-  virtual void   GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrixF & gmat) const ;
+  virtual void   GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrixF & /* gmat */) const 
+                 {GetGlobal(RecPoint,gpos); }
   virtual void   GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos) const ;
   virtual Bool_t Impact(const TParticle * particle) const ;
 
-  AliPHOSGeometry & operator = (const AliPHOSGeometry  & /*rvalue*/) const {
-    Fatal("operator =", "nt implemented") ; return *(GetInstance()) ; }
+  AliPHOSGeometry & operator = (const AliPHOSGeometry  & /*rvalue*/) {
+    Fatal("operator =", "not implemented") ;
+    return *this ;    
+  }
  
   // General
 
@@ -55,20 +55,21 @@ public:
   Bool_t AbsToRelNumbering(Int_t AbsId, Int_t * RelId) const ; 
                                           // converts the absolute PHOS numbering to a relative 
 
-  void EmcModuleCoverage(Int_t m, Double_t & tm, Double_t & tM, Double_t & pm, 
-                                         Double_t & pM, Option_t * opt = Radian() ) const ;
-                                         // calculates the angular coverage in theta and phi of a EMC module
-  void EmcXtalCoverage(Double_t & theta, Double_t & phi, Option_t * opt = Radian() ) const ; 
-                                         // calculates the angular coverage in theta and phi of a  
-                                         // single crystal in a EMC module
-  void ImpactOnEmc(Double_t theta, Double_t phi, Int_t & ModuleNumber, 
-                        Double_t & z, Double_t & x) const ; 
-  void ImpactOnEmc(const TVector3& vec, Int_t & ModuleNumber, 
-                        Double_t & z, Double_t & x) const ; 
-  void ImpactOnEmc(const TParticle& p, Int_t & ModuleNumber, 
-                        Double_t & z, Double_t & x) const ; 
-                                        // calculates the impact coordinates of a neutral particle  
-                                         // emitted in direction theta and phi in ALICE
+//  void EmcModuleCoverage(Int_t m, Double_t & tm, Double_t & tM, Double_t & pm, 
+//                                       Double_t & pM, Option_t * opt = Radian() ) const ;
+//                                         // calculates the angular coverage in theta and phi of a EMC module
+//  void EmcXtalCoverage(Double_t & theta, Double_t & phi, Option_t * opt = Radian() ) const ; 
+//                                         // calculates the angular coverage in theta and phi of a  
+//                                         // single crystal in a EMC module
+
+  void ImpactOnEmc(Double_t * vtx, Double_t theta, Double_t phi, 
+                  Int_t & ModuleNumber, Double_t & z, Double_t & x) const ; 
+//  void ImpactOnEmc(const TVector3& vec, Int_t & ModuleNumber, 
+//                      Double_t & z, Double_t & x) const ; 
+//  void ImpactOnEmc(const TParticle& p, Int_t & ModuleNumber, 
+//                      Double_t & z, Double_t & x) const ; 
+//                                        // calculates the impact coordinates of a neutral particle  
+//                                         // emitted in direction theta and phi in ALICE
   Bool_t IsInEMC(Int_t id) const { if (id > GetNModules() *  GetNCristalsInModule() ) return kFALSE; return kTRUE; } 
   void RelPosInModule(const Int_t * RelId, Float_t & y, Float_t & z) const ; 
                                          // gets the position of element (pad or Xtal) relative to 
@@ -79,6 +80,9 @@ public:
                                          // converts the absolute PHOS numbering to a relative 
   void  RelPosToAbsId(Int_t module, Double_t x, Double_t z, Int_t & AbsId) const; 
                                          // converts local PHOS-module (x, z) coordinates to absId 
+  void  GetIncidentVector(const TVector3 &vtx, Int_t module, Float_t x, Float_t z, TVector3& vInc) const ;
+                                         //calculates vector from vertex to current point in module local frame
+  void  Local2Global(Int_t module, Float_t x, Float_t z, TVector3 &globaPos) const ;
 
   Bool_t IsInitialized(void)                  const { return fgInit ; }  
                                                                        
@@ -98,7 +102,7 @@ public:
     return fModuleAngle[module][axis][angle];}
   
 
-  // Return EMCA geometry parameters
+  // Return ideal EMCA geometry parameters
 
   AliPHOSEMCAGeometry * GetEMCAGeometry()      const {return fGeometryEMCA ;}
   Float_t   GetIPtoCrystalSurface(void)        const { return fGeometryEMCA->GetIPtoCrystalSurface() ; }
@@ -107,7 +111,7 @@ public:
   Int_t     GetNZ(void)                        const { return fGeometryEMCA->GetNZ() ; }
   Int_t     GetNCristalsInModule(void)         const { return fGeometryEMCA->GetNPhi() * fGeometryEMCA->GetNZ() ; }
 
-  // Return CPV geometry parameters
+  // Return ideal CPV geometry parameters
   Int_t   GetNumberOfCPVLayers(void)           const { return fGeometryCPV ->GetNumberOfCPVLayers();      }
   Float_t GetCPVActiveSize(Int_t index)        const { return fGeometryCPV->GetCPVActiveSize(index);      }
   Int_t   GetNumberOfCPVChipsPhi(void)         const { return fGeometryCPV->GetNumberOfCPVChipsPhi();     }
@@ -125,6 +129,9 @@ public:
   Float_t GetCPVBoxSize(Int_t index)           const { return fGeometryCPV ->GetCPVBoxSize(index);        } 
   Float_t GetIPtoCPVDistance(void)             const { return  GetIPtoOuterCoverDistance() - 
                                                               GetCPVBoxSize(1) - 1.0; }
+
+
+  // Return real CPV geometry parameters
   void GetModuleCenter(TVector3& center, const char *det, Int_t module) const;
   void Global2Local(TVector3& localPosition,
                    const TVector3& globalPosition,
@@ -149,10 +156,7 @@ public:
 
 protected:
 
-  AliPHOSGeometry(const Text_t* name, const Text_t* title="") : AliGeometry(name, title) { 
-    // ctor only for internal usage (singleton)
-    Init() ; 
-  }
+  AliPHOSGeometry(const Text_t* name, const Text_t* title="") ;
 private:
 
   Int_t                    fNModules ;       // Number of modules constituing PHOS