AliFstream is moved to RAW package in order to avoid dependencies

[u/mrichter/AliRoot.git] / PHOS / AliPHOSRecCpvManager.cxx

diff --git a/PHOS/AliPHOSRecCpvManager.cxx b/PHOS/AliPHOSRecCpvManager.cxx
index 17eb26682902db0b7a3853198a86c8a3b683c6b0..fba2e8ae3c4296a5c56c1f74af0d242980aad625 100644 (file)
--- a/PHOS/AliPHOSRecCpvManager.cxx
+++ b/PHOS/AliPHOSRecCpvManager.cxx
@@ -14,9 +14,9 @@
  **************************************************************************/
 
 
- //_________________________________________________________________________
+//_________________________________________________________________________
 // Class for the management by the CPV reconstruction.
-//                  
+////                  
 //*-- Author   : Boris Polichtchouk (IHEP, Protvino) 6 Mar 2001
 //
 // --- ROOT system ---
@@ -26,7 +26,8 @@
 // --- AliRoot header files ---
 
 #include "AliPHOSRecCpvManager.h"
-#include "AliPHOSGetter.h"
+#include "AliPHOSGeometry.h" 
+#include "AliPHOSLoader.h"
 
 ClassImp(AliPHOSRecCpvManager) 
 
@@ -63,7 +64,7 @@ AliPHOSRecCpvManager::~AliPHOSRecCpvManager(void)
   // Put a comment here
 }
 
-Float_t AliPHOSRecCpvManager::Dispersion(Float_t etot, Float_t ai, Float_t ei) const
+Float_t AliPHOSRecCpvManager::Dispersion(Float_t etot, Float_t ai) const
 {
   //"Dispresion" of energy deposition in the cell.
   // etot is the total shower energy, ai is the
@@ -74,7 +75,7 @@ Float_t AliPHOSRecCpvManager::Dispersion(Float_t etot, Float_t ai, Float_t ei) c
   return kConst*ai*(1.-ai/etot);
 }
 
-Float_t AliPHOSRecCpvManager::OneGamChi2(Float_t ai, Float_t ei, Float_t etot, Float_t& Gi)
+Float_t AliPHOSRecCpvManager::OneGamChi2(Float_t ai, Float_t ei, Float_t etot, Float_t& Gi) const
 {
   //"Chi2" for one cell.
   // etot is the total "shower" energy, ai is the
@@ -118,8 +119,8 @@ void AliPHOSRecCpvManager::AG(Float_t ei, Float_t xi, Float_t yi, Float_t& ai, F
   //xi and yi are the distances along x and y from reference point 
   // to the pad center.
 
-  AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ; 
-  const AliPHOSGeometry* geom = gime->PHOSGeometry();
+  AliPHOSGeometry * geom = AliPHOSLoader::GetPHOSGeometry();
+
   Float_t celZ = geom->GetPadSizeZ();
   Float_t celY = geom->GetPadSizePhi();
 
@@ -161,7 +162,7 @@ Float_t AliPHOSRecCpvManager::Fcml(Float_t x, Float_t y)
     - TMath::ATan(x*y/(7*kb*TMath::Sqrt((7*kb)*(7*kb) + x*x+y*y)))
     + TMath::ATan(x*y/(9*kb*TMath::Sqrt((9*kb)*(9*kb) + x*x+y*y))); 
   
-  Float_t fcml = ka*fff/6.2831853071796;
+  Float_t fcml = ka*fff/TMath::TwoPi();
 //    Info("Fcml", "fcml: %f", fcml) ;
   return fcml;
 
@@ -183,7 +184,7 @@ Float_t AliPHOSRecCpvManager::GradX(Float_t x, Float_t y)
     - y*(1.-x*x/skv)*7*kb*TMath::Sqrt(skv)/((7*kb)*(7*kb)*skv+x*x*y*y)
     + y*(1.-x*x/skv)*9*kb*TMath::Sqrt(skv)/((9*kb)*(9*kb)*skv+x*x*y*y);
       
-  Float_t grad    = ka*gradient/6.2831853071796;
+  Float_t grad    = ka*gradient/TMath::TwoPi();
   return grad;
 }
 
@@ -192,7 +193,7 @@ Float_t AliPHOSRecCpvManager::GradY(Float_t x, Float_t y)
 {
   // Put a comment here
   
-  const Float_t a = 1.0;
+  const Float_t ka = 1.0;
   const Float_t kb = 0.70;
  
   Float_t skv      = kb*kb + x*x + y*y;
@@ -202,7 +203,7 @@ Float_t AliPHOSRecCpvManager::GradY(Float_t x, Float_t y)
     - x*(1.-y*y/skv)*7*kb*TMath::Sqrt(skv)/((7*kb)*(7*kb)*skv+x*x*y*y)
     + x*(1.-y*y/skv)*9*kb*TMath::Sqrt(skv)/((9*kb)*(9*kb)*skv+x*x*y*y);
   
-  Float_t grad    = a*gradient/6.2831853071796;
+  Float_t grad    = ka*gradient/TMath::TwoPi();
   return grad;
 }