X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSRecEmcManager.cxx;h=1daf093e8da1203992864f7b3089a8ee85f1d7ba;hb=117e9d0df9ce614c99755cb5b6bbd37a01bfe927;hp=c6de4e503db58eb85a1a94e60d6247178caeed4c;hpb=386aef34aa74c52f3326dd6348ae7fe33394e566;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSRecEmcManager.cxx b/PHOS/AliPHOSRecEmcManager.cxx
index c6de4e503db..1daf093e8da 100644
--- a/PHOS/AliPHOSRecEmcManager.cxx
+++ b/PHOS/AliPHOSRecEmcManager.cxx
@@ -13,6 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
 
 //_________________________________________________________________________
 // Class for the management by the Emc reconstruction.
@@ -21,48 +22,39 @@
 //
 // --- ROOT system ---
 
+#include <TMath.h>
+
 // --- Standard library ---
 
 // --- AliRoot header files ---
 
 #include "AliPHOSRecEmcManager.h"
-#include "AliPHOS.h"
-#include "AliRun.h"
 
 ClassImp(AliPHOSRecEmcManager) 
 
 //____________________________________________________________________________
 
-  AliPHOSRecEmcManager::AliPHOSRecEmcManager()
+AliPHOSRecEmcManager::AliPHOSRecEmcManager():
+  fOneGamChisqCut(1.3f),
+  fOneGamInitialStep(0.00005f),
+  fOneGamChisqMin(1.f),
+  fOneGamStepMin(0.0005f),
+  fOneGamNumOfIterations(50),
+  fTwoGamInitialStep(0.00005f),
+  fTwoGamChisqMin(1.f),
+  fTwoGamEmin(0.1f),
+  fTwoGamStepMin(0.00005),
+  fTwoGamNumOfIterations(50),
+  fThr0(0.f),
+  fSqdCut(0.f)
 {
   // default ctor
-//    fOneGamChisqCut = 3.;
-  fOneGamChisqCut = 1.3; // bvp 31.08.2001 
-
-  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.6;
-  fThr0 = 0.;
-//    fSqdCut = 3.;
-//    fSqdCut = 0.5; // bvp 31.08.2001
-  fSqdCut = 0.;
-
   SetTitle("Emc Reconstruction Manager");
-
 }
 
 AliPHOSRecEmcManager::~AliPHOSRecEmcManager(void) {}
 
-Float_t AliPHOSRecEmcManager::Dispersion(Float_t eTot, Float_t ai, Float_t ei) const
+Float_t AliPHOSRecEmcManager::Dispersion(Float_t ei) const
 {
   //"Dispresion" of energy deposition in the cell.
   // eTot is the total shower energy, ai is the
@@ -72,11 +64,12 @@ Float_t AliPHOSRecEmcManager::Dispersion(Float_t eTot, Float_t ai, Float_t ei) c
   return ei;
 }
 
-Float_t AliPHOSRecEmcManager::OneGamChi2(Float_t ai, Float_t ei, Float_t eTot, Float_t& gi) const
+Float_t AliPHOSRecEmcManager::OneGamChi2(Float_t ai, Float_t ei, Float_t fi, Float_t& gi) const
 {
   // Chi2 used in OneGam (one-gamma fitting).
   // gi is d(Chi2)/d(ai).
 
+  fi = 0 ; 
   Float_t da = ai - ei;
   Float_t d = ei; // we assume that sigma(E) = sqrt(E)
   gi = 2.*(ai-ei)/d;
@@ -85,9 +78,10 @@ Float_t AliPHOSRecEmcManager::OneGamChi2(Float_t ai, Float_t ei, Float_t eTot, F
 
 }
 
-Float_t AliPHOSRecEmcManager::TwoGamChi2(Float_t ai, Float_t ei, Float_t eTot, Float_t& gi) const
+Float_t AliPHOSRecEmcManager::TwoGamChi2(Float_t ai, Float_t ei, Float_t fi, Float_t& gi) const
 {
   // calculates chi^2
+  fi = 0 ; 
   Float_t da = ai - ei;
   Float_t d = ei; // we assume that sigma(E) = sqrt(E)
   gi = 2.*(ai-ei)/d;