Revert "remove argument from method, pass the parameter via data member switchable"

This reverts commit 55bdd579b3b6ab81ccc951dd3b66c5b5e3ce0dbe.

diff --git a/EMCAL/AliEMCALRecoUtils.cxx b/EMCAL/AliEMCALRecoUtils.cxx
index 0c42ff3154fd35aeee4bd973231702f1574181ad..13b469ae0b989fcbb9189422441bbdf91cdf30f3 100644 (file)
--- a/EMCAL/AliEMCALRecoUtils.cxx
+++ b/EMCAL/AliEMCALRecoUtils.cxx
@@ -141,12 +141,10 @@ AliEMCALRecoUtils::AliEMCALRecoUtils(const AliEMCALRecoUtils & reco)
   //Copy ctor
   
   for (Int_t i = 0; i < 15 ; i++) { fMisalRotShift[i]      = reco.fMisalRotShift[i]      ; 
-                                    fMisalTransShift[i]    = reco.fMisalTransShift[i]    ; }
+                                   fMisalTransShift[i]    = reco.fMisalTransShift[i]    ; }
   for (Int_t i = 0; i < 7  ; i++) { fNonLinearityParams[i] = reco.fNonLinearityParams[i] ; }
   for (Int_t i = 0; i < 3  ; i++) { fSmearClusterParam[i]  = reco.fSmearClusterParam[i]  ; }
 
-  fUseMassForTracking = reco.fUseMassForTracking;
-
 }
 
 
@@ -225,8 +223,7 @@ AliEMCALRecoUtils & AliEMCALRecoUtils::operator = (const AliEMCALRecoUtils & rec
   fCutDCAToVertex2D          = reco.fCutDCAToVertex2D;
   fCutRequireITSStandAlone   = reco.fCutRequireITSStandAlone; 
   fCutRequireITSpureSA       = reco.fCutRequireITSpureSA;
-  fUseMassForTracking        = reco.fUseMassForTracking;
-  
+
   if (reco.fResidualEta) {
     // assign or copy construct
     if (fResidualEta) { 
@@ -1018,11 +1015,9 @@ void AliEMCALRecoUtils::InitParameters()
   fCutMaxDCAToVertexZ  = 1e10;              
   fCutDCAToVertex2D    = kFALSE;
   
-  fCutRequireITSStandAlone = kFALSE; //Marcel
+  fCutRequireITSStandAlone = kFALSE; //MARCEL
   fCutRequireITSpureSA     = kFALSE; //Marcel
   
-  fUseMassForTracking      = kFALSE;
-  
   //Misalignment matrices
   for (Int_t i = 0; i < 15 ; i++) 
   {
@@ -2008,7 +2003,8 @@ Int_t  AliEMCALRecoUtils::FindMatchedClusterInClusterArr(const AliExternalTrackP
 //------------------------------------------------------------------------------------
 Bool_t AliEMCALRecoUtils::ExtrapolateTrackToEMCalSurface(AliVTrack *track,
                                                          Double_t emcalR, Double_t mass,
-                                                         Double_t step, Double_t minpt)
+                                                         Double_t step, Double_t minpt,
+                                                         Bool_t useMassForTracking)
 { 
   // Extrapolate track to EMCAL surface
 
@@ -2037,13 +2033,13 @@ Bool_t AliEMCALRecoUtils::ExtrapolateTrackToEMCalSurface(AliVTrack *track,
     
     if (esdt)
     {
-      if ( fUseMassForTracking ) mass = esdt->GetMassForTracking();
-      else                       mass = esdt->GetMass(onlyTPC);
+      if ( useMassForTracking ) mass = esdt->GetMassForTracking();
+      else                      mass = esdt->GetMass(onlyTPC);
     }
     else
     {
-      if ( fUseMassForTracking ) mass = aodt->GetMassForTracking();
-      else                       mass = aodt->M();
+      if ( useMassForTracking ) mass = aodt->GetMassForTracking();
+      else                      mass = aodt->M();
     }
   }
 

diff --git a/EMCAL/AliEMCALRecoUtils.h b/EMCAL/AliEMCALRecoUtils.h
index 6da7567cbb96e30c84d4319639737f43b165c928..b8c89bc4a8abb52f965c83c33bb5a4fde68d88fd 100644 (file)
--- a/EMCAL/AliEMCALRecoUtils.h
+++ b/EMCAL/AliEMCALRecoUtils.h
@@ -227,7 +227,8 @@ public:
                                           Float_t &dEta, Float_t &dPhi);
   static Bool_t ExtrapolateTrackToEMCalSurface(AliVTrack *track, /*note, on success the call will change the track*/
                                                Double_t emcalR=440, Double_t mass=0.1396,
-                                               Double_t step=20, Double_t minpT=0.35);
+                                               Double_t step=20, Double_t minpT=0.35,
+                                               Bool_t useMassForTracking = kFALSE);
   static Bool_t ExtrapolateTrackToEMCalSurface(AliExternalTrackParam *trkParam, 
                                                Double_t emcalR, Double_t mass, Double_t step, 
                                                Float_t &eta, Float_t &phi, Float_t &pt);
@@ -270,11 +271,7 @@ public:
   void     SetStep(Double_t step)                     { fStepSurface = step           ; }
   void     SetStepCluster(Double_t step)              { fStepCluster = step           ; }
   void     SetITSTrackSA(Bool_t isITS)                { fITSTrackSA = isITS           ; } //Special Handle of AliExternTrackParam    
-  
-  Bool_t   IsMassForTrackingUsed()                    { return fUseMassForTracking     ; }
-  void     SwitchOnUseMassForTracking()               { fUseMassForTracking = kTRUE    ; }
-  void     SwitchOffUseMassForTracking()              { fUseMassForTracking = kFALSE   ; }
-  
+    
   // Exotic cells / clusters
   Bool_t   IsExoticCell(Int_t absId, AliVCaloCells* cells, Int_t bc =-1) ;
   void     SwitchOnRejectExoticCell()                 { fRejectExoticCells = kTRUE     ; }
@@ -428,9 +425,7 @@ private:
   Bool_t     fCutRequireITSStandAlone;   // Require ITSStandAlone
   Bool_t     fCutRequireITSpureSA;       // ITS pure standalone tracks
   
-  static Bool_t fUseMassForTracking;     // Change mass hypothesis.
-  
-  ClassDef(AliEMCALRecoUtils, 23)
+  ClassDef(AliEMCALRecoUtils, 22)
 };
 #endif // ALIEMCALRECOUTILS_H