X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSRecCpvManager.cxx;h=f393c18d6d6eb4b93bfa19aa3fb43e48c98d4c12;hb=fe0af2550d3cdb2570fa09852391f9849ba4954d;hp=ae0595dd42dfcc98b756737b017af0a59b769c6f;hpb=90cceaf6d2e2e6b2e735135cb2d6562308e10ed7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSRecCpvManager.cxx b/PHOS/AliPHOSRecCpvManager.cxx
index ae0595dd42d..f393c18d6d6 100644
--- a/PHOS/AliPHOSRecCpvManager.cxx
+++ b/PHOS/AliPHOSRecCpvManager.cxx
@@ -13,6 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
 
 //_________________________________________________________________________
 // Class for the management by the CPV reconstruction.
@@ -21,40 +22,33 @@
 //
 // --- ROOT system ---
 
+#include <TMath.h>
+
 // --- Standard library ---
 
 // --- AliRoot header files ---
 
 #include "AliPHOSRecCpvManager.h"
-#include "AliPHOSGetter.h"
+#include "AliPHOSGeometry.h" 
 
 ClassImp(AliPHOSRecCpvManager) 
 
 //____________________________________________________________________________
-
-  AliPHOSRecCpvManager::AliPHOSRecCpvManager()
+AliPHOSRecCpvManager::AliPHOSRecCpvManager() :
+  fOneGamChisqCut(3.),
+  fOneGamInitialStep(0.00005),
+  fOneGamChisqMin(1.),
+  fOneGamStepMin(0.0005),
+  fOneGamNumOfIterations(50),
+  fTwoGamInitialStep(0.00005),
+  fTwoGamChisqMin(1.),
+  fTwoGamEmin(0.1),
+  fTwoGamStepMin(0.00005),
+  fTwoGamNumOfIterations(50),  
+  fThr0(0.),
+  fSqdCut(0.) 
 {
   // Put a comment here
-
-  fOneGamChisqCut = 3.; // If Chi2/dof > fOneGamChisqCut, split point.
-
-  fOneGamInitialStep = 0.00005;
-  fOneGamChisqMin = 1.;
-  fOneGamStepMin = 0.0005;
-  fOneGamNumOfIterations = 50;
-
-  fTwoGamInitialStep = 0.00005;
-  fTwoGamChisqMin = 1.;
-  fTwoGamEmin = 0.1;
-  fTwoGamStepMin = 0.00005;
-  fTwoGamNumOfIterations = 50;  
-
-//    fThr0 = 0.0285; // Min. energy of rec. point. If E<fThr0, point deleted.
-//    fSqdCut = 3.; // Min. distance (in cm) between two rec points.
-
-  fThr0 = 0.; 
-  fSqdCut = 0.; 
-  
   SetTitle("Cpv Reconstruction Manager");
 }
 
@@ -118,7 +112,7 @@ 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.
 
-  AliPHOSGeometry * geom = AliPHOSLoader::GetPHOSGeometry();
+  AliPHOSGeometry * geom =  AliPHOSGeometry::GetInstance() ;
 
   Float_t celZ = geom->GetPadSizeZ();
   Float_t celY = geom->GetPadSizePhi();