Using the recommended way of forward declarations for TVector and TMatrix (see v5...

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

diff --git a/PHOS/AliPHOSGeometry.h b/PHOS/AliPHOSGeometry.h
index 015a9f755655288537ac700d83d708b7bbb70101..a2caa3c2246f780cb3a1284f15250fb2c9864217 100644 (file)
--- a/PHOS/AliPHOSGeometry.h
+++ b/PHOS/AliPHOSGeometry.h
@@ -39,7 +39,7 @@ public:
   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, TMatrix & gmat) const ;
+  virtual void   GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrixF & gmat) const ;
   virtual void   GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos) const ;
   virtual Bool_t Impact(const TParticle * particle) const ;
 
@@ -63,9 +63,9 @@ public:
                                          // 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(TVector3 vec, Int_t & ModuleNumber, 
+  void ImpactOnEmc(const TVector3& vec, Int_t & ModuleNumber, 
                         Double_t & z, Double_t & x) const ; 
-  void ImpactOnEmc(TParticle p, Int_t & ModuleNumber, 
+  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
@@ -77,7 +77,7 @@ public:
                                          // gets the position of element (pad or Xtal) relative to Alice
   Bool_t RelToAbsNumbering(const Int_t * RelId, Int_t & AbsId) const ;         
                                          // converts the absolute PHOS numbering to a relative 
-  void  RelPosToAbsId(const Int_t module, const Double_t x, const Double_t z, Int_t & AbsId) const; 
+  void  RelPosToAbsId(Int_t module, Double_t x, Double_t z, Int_t & AbsId) const; 
                                          // converts local PHOS-module (x, z) coordinates to absId 
 
   Bool_t IsInitialized(void)                  const { return fgInit ; }  
@@ -119,8 +119,10 @@ public:
   Float_t GetCPVBoxSize(Int_t index)           const { return fGeometryCPV ->GetCPVBoxSize(index);        } 
   Float_t GetIPtoCPVDistance(void)             const { return  GetIPtoOuterCoverDistance() - 
                                                               GetCPVBoxSize(1) - 1.0; }
-  TVector3 GetModuleCenter(const char *det, Int_t module) const;
-  TVector3 Global2Local(TVector3 globalPosition, Int_t module) const;
+  void GetModuleCenter(TVector3& center, const char *det, Int_t module) const;
+  void Global2Local(TVector3& localPosition,
+                   const TVector3& globalPosition,
+                   Int_t module) const;
 
   // Return PHOS' support geometry parameters