Unused variable is eliminated

diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx
index 92e519787a2440a661ada719aa15e6b163bc9a2f..4450e4d56be29793ca2d54aab8581dc8064e2e79 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.cxx
+++ b/PHOS/AliPHOSClusterizerv1.cxx
@@ -490,6 +490,7 @@ void AliPHOSClusterizerv1::WriteRecPoints()
   //Evaluate position, dispersion and other RecPoint properties..
   Int_t nEmc = fEMCRecPoints->GetEntriesFast();
   Float_t emcMinE= AliPHOSReconstructor::GetRecoParamEmc()->GetMinE(); //Minimal digit energy
+  TVector3 fakeVtx(0.,0.,0.) ;
   for(index = 0; index < nEmc; index++){
     AliPHOSEmcRecPoint * rp =
       dynamic_cast<AliPHOSEmcRecPoint *>( fEMCRecPoints->At(index) );
@@ -501,9 +502,8 @@ void AliPHOSClusterizerv1::WriteRecPoints()
     }
 
     // No vertex is available now, calculate corrections in PID
-    rp->EvalAll(fW0,fDigitsArr) ;
+    rp->EvalAll(fDigitsArr) ;
     rp->EvalCoreEnergy(fW0,fEcoreRadius,fDigitsArr) ;
-    TVector3 fakeVtx(0.,0.,0.) ;
     rp->EvalAll(fW0,fakeVtx,fDigitsArr) ;
     rp->EvalLocal2TrackingCSTransform();
   }
@@ -520,7 +520,8 @@ void AliPHOSClusterizerv1::WriteRecPoints()
   //Now the same for CPV
   for(index = 0; index < fCPVRecPoints->GetEntries(); index++){
     AliPHOSCpvRecPoint * rp = dynamic_cast<AliPHOSCpvRecPoint *>( fCPVRecPoints->At(index) );
-    rp->EvalAll(fW0CPV,fDigitsArr) ;
+    rp->EvalAll(fDigitsArr) ;
+    rp->EvalAll(fW0CPV,fakeVtx,fDigitsArr) ;
     rp->EvalLocal2TrackingCSTransform();
   }
   fCPVRecPoints->Sort() ;

diff --git a/PHOS/AliPHOSCpvRecPoint.cxx b/PHOS/AliPHOSCpvRecPoint.cxx
index 0b9105429c0d84137adc863fd553a41b85a19d7c..5f3a4c566eba4ed25e1183a55cec66dc3a63b1b7 100644 (file)
--- a/PHOS/AliPHOSCpvRecPoint.cxx
+++ b/PHOS/AliPHOSCpvRecPoint.cxx
@@ -249,19 +249,19 @@ void AliPHOSCpvRecPoint::ExecuteEvent(Int_t, Int_t, Int_t ) /*const*/
 }
 
 //____________________________________________________________________________
-void AliPHOSCpvRecPoint::EvalAll(Float_t logWeight, TClonesArray * digits)
+void AliPHOSCpvRecPoint::EvalAll(TClonesArray * digits)
 {
   // Evaluate local coordinate assuming the vertex in (000) and no inclination
-  TVector3 vtx(0,0,0), vInc(0,1,0);
-  AliPHOSEmcRecPoint::EvalAll(logWeight,digits) ;
-  EvalLocalPosition(logWeight, vtx, digits,vInc) ;
-  EvalClusterLengths(digits) ;
+  AliPHOSEmcRecPoint::EvalAll(digits) ;
 }
 //____________________________________________________________________________
 void AliPHOSCpvRecPoint::EvalAll(Float_t logWeight, TVector3 &vtx, TClonesArray * digits)
 {
   // wraps other methods
+  TVector3 vInc(0,1,0);
   AliPHOSEmcRecPoint::EvalAll(logWeight,vtx,digits) ;
+  EvalLocalPosition(logWeight, vtx, digits,vInc) ;
+  EvalClusterLengths(digits) ;
 }
 //____________________________________________________________________________
 void AliPHOSCpvRecPoint::EvalLocalPosition(Float_t logWeight, TVector3 & /*vtx */, TClonesArray * digits, TVector3 &/* vInc */)

diff --git a/PHOS/AliPHOSCpvRecPoint.h b/PHOS/AliPHOSCpvRecPoint.h
index 49b4862d8e1f3e480a50d69f6f4288984046244b..799f46113e5675785517c6ddfdee4b9a2b2acdbd 100644 (file)
--- a/PHOS/AliPHOSCpvRecPoint.h
+++ b/PHOS/AliPHOSCpvRecPoint.h
@@ -46,8 +46,8 @@ public:
   virtual ~AliPHOSCpvRecPoint() ;  
 
   Int_t  Compare(const TObject * obj) const;                 // method for sorting  
-  void   EvalAll(Float_t logWeight, TClonesArray * digits) ;
-  void   EvalAll(Float_t logWeight, TVector3 &vtx, TClonesArray * digits) ;
+  virtual void EvalAll(TClonesArray * digits) ;
+  virtual void EvalAll(Float_t logWeight, TVector3 &vtx, TClonesArray * digits) ;
   void   EvalLocalPosition(Float_t logWeight, TVector3 &vtx, TClonesArray * digits, TVector3 &vInc) ;
   void   EvalClusterLengths(TClonesArray * digits) ;
 

diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx
index 11af52ee5e5eac856a5bddd42c3e2fe8b0fe3a77..a461d7ff9a2f5babddebece42931a80d1d39ee7d 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.cxx
+++ b/PHOS/AliPHOSEmcRecPoint.cxx
@@ -768,7 +768,7 @@ void  AliPHOSEmcRecPoint::EvalPrimaries(TClonesArray * digits)
 }
 
 //____________________________________________________________________________
-void AliPHOSEmcRecPoint::EvalAll(Float_t logWeight, TClonesArray * digits )
+void AliPHOSEmcRecPoint::EvalAll(TClonesArray * digits )
 {
 //   EvalCoreEnergy(logWeight, digits);
   EvalTime(digits) ;

diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h
index 7dc6518f767a69cdf177c903681b30727bea9aec..58fb9e0ae78e17af662ea4224e27645bdda37f59 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.h
+++ b/PHOS/AliPHOSEmcRecPoint.h
@@ -51,7 +51,7 @@ public:
   virtual void  AddDigit(AliPHOSDigit & digit, Float_t Energy) ;          // add a digit to the digits list  
   Int_t       Compare(const TObject * obj) const;                         // method for sorting  
 
-  virtual void  EvalAll(Float_t logWeight, TClonesArray * digits) ; //Those tasks which can be done without vertex
+  virtual void  EvalAll(TClonesArray * digits) ; //Those tasks which can be done without vertex
   virtual void  EvalAll(Float_t logWeight, TVector3 &vtx, TClonesArray * digits) ;
           void  EvalCoreEnergy(Float_t logWeight, Float_t coreRadius, TClonesArray * digits) ;             
 

diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h
index 743b31df9e69ad32ff82908e5fb6c231a9c9888f..eb099cc48368a040066927257bab33313b90dd4a 100644 (file)
--- a/PHOS/AliPHOSRecPoint.h
+++ b/PHOS/AliPHOSRecPoint.h
@@ -41,7 +41,7 @@ class AliPHOSRecPoint : public AliCluster {
   virtual Int_t   DistancetoPrimitive(Int_t px, Int_t py);
   virtual void    Draw(Option_t * option="") ;
   virtual void    ExecuteEvent(Int_t event, Int_t px, Int_t py) ;
-  void            EvalAll(TClonesArray * digits) ;  
+  virtual void    EvalAll(TClonesArray * digits) ;  
   void            EvalLocal2TrackingCSTransform();
   virtual void    EvalPHOSMod(AliPHOSDigit * digit) ;  
   virtual int *   GetDigitsList(void) const { return fDigitsList ; }