X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSEmcRecPoint.cxx;h=a461d7ff9a2f5babddebece42931a80d1d39ee7d;hb=6e780c51c6f6907734e6f4e371abf823d1d57d20;hp=63604ad2dfb8efc6a1effff3c2e1ea53af72a99a;hpb=308fb9420c99d1c7c0fe86ac797c537ff337fff7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx
index 63604ad2dfb..a461d7ff9a2 100644
--- a/PHOS/AliPHOSEmcRecPoint.cxx
+++ b/PHOS/AliPHOSEmcRecPoint.cxx
@@ -32,23 +32,13 @@
  *
  * Revision 1.55  2007/01/19 20:31:19  kharlov
  * Improved formatting for Print()
- *
- * Revision 1.54  2006/08/28 10:01:56  kharlov
- * Effective C++ warnings fixed (Timur Pocheptsov)
- *
- * Revision 1.53  2005/12/20 14:28:47  hristov
- * Additional protection
- *
- * Revision 1.52  2005/05/28 14:19:04  schutz
- * Compilation warnings fixed by T.P.
- *
  */
 
 //_________________________________________________________________________
 //  RecPoint implementation for PHOS-EMC 
 //  An EmcRecPoint is a cluster of digits   
-//*--
-//*-- Author: Dmitri Peressounko (RRC KI & SUBATECH)
+//--
+//-- Author: Dmitri Peressounko (RRC KI & SUBATECH)
 
 
 // --- ROOT system ---
@@ -66,6 +56,7 @@
 #include "AliPHOSGeometry.h"
 #include "AliPHOSDigit.h"
 #include "AliPHOSEmcRecPoint.h"
+#include "AliPHOSReconstructor.h"
  
 ClassImp(AliPHOSEmcRecPoint)
 
@@ -258,15 +249,15 @@ void AliPHOSEmcRecPoint::ExecuteEvent(Int_t event, Int_t, Int_t) /*const*/
       AliError(Form("Cannot find Run Loader in Default Event Folder"));
       return;
     }
-  AliPHOSLoader* gime = dynamic_cast<AliPHOSLoader*>(rn->GetLoader("PHOSLoader"));
-  if (gime == 0x0) 
+  AliPHOSLoader* phosLoader = dynamic_cast<AliPHOSLoader*>(rn->GetLoader("PHOSLoader"));
+  if (phosLoader == 0x0) 
     {
       AliError(Form("Cannot find PHOS Loader from Run Loader"));
       return;
     }
   
   
-  const TClonesArray * digits = gime->Digits() ;
+  const TClonesArray * digits = phosLoader->Digits() ;
   
   switch (event) {
     
@@ -430,7 +421,7 @@ void  AliPHOSEmcRecPoint::EvalDispersion(Float_t logWeight,TClonesArray * digits
  
 }
 //______________________________________________________________________________
-void AliPHOSEmcRecPoint::EvalCoreEnergy(Float_t logWeight, TClonesArray * digits)
+void AliPHOSEmcRecPoint::EvalCoreEnergy(Float_t logWeight, Float_t coreRadius, TClonesArray * digits)
 {
   // This function calculates energy in the core, 
   // i.e. within a radius rad = 3cm around the center. Beyond this radius
@@ -438,8 +429,6 @@ void AliPHOSEmcRecPoint::EvalCoreEnergy(Float_t logWeight, TClonesArray * digits
   // should be less than 2%
 //DP: non-perpendicular incidence??????????????
 
-  Float_t coreRadius = 3 ;
-
   Float_t x = 0 ;
   Float_t z = 0 ;
 
@@ -541,8 +530,7 @@ void  AliPHOSEmcRecPoint::EvalElipsAxis(Float_t logWeight,TClonesArray * digits,
 //   //Apply correction due to non-perpendicular incidence
 //   Double_t CosX ;
 //   Double_t CosZ ;
-//   AliPHOSGetter * gime = AliPHOSGetter::Instance() ; 
-//   AliPHOSGeometry * phosgeom =  (AliPHOSGeometry*)gime->PHOSGeometry();
+//   AliPHOSGeometry * phosgeom = AliPHOSGeometry::GetInstance() ;
 //   Double_t DistanceToIP= (Double_t ) phosgeom->GetIPtoCrystalSurface() ;
   
 //   CosX = DistanceToIP/TMath::Sqrt(DistanceToIP*DistanceToIP+x*x) ;
@@ -780,9 +768,9 @@ void  AliPHOSEmcRecPoint::EvalPrimaries(TClonesArray * digits)
 }
 
 //____________________________________________________________________________
-void AliPHOSEmcRecPoint::EvalAll(Float_t logWeight, TClonesArray * digits )
+void AliPHOSEmcRecPoint::EvalAll(TClonesArray * digits )
 {
-  EvalCoreEnergy(logWeight, digits);
+//   EvalCoreEnergy(logWeight, digits);
   EvalTime(digits) ;
   EvalPrimaries(digits) ;
   AliPHOSRecPoint::EvalAll(digits) ;
@@ -856,7 +844,6 @@ void AliPHOSEmcRecPoint::EvalLocalPosition(Float_t logWeight, TVector3 &vtx, TCl
   fLocPos.SetY(0.) ;
   fLocPos.SetZ(z - depthz)  ;
 
-  fLocPosM = 0 ;
 }
 
 //____________________________________________________________________________