Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGCF / Correlations / Base / AliAnalyseLeadingTrackUE.cxx

diff --git a/PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.cxx b/PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.cxx
index c2bcc7dfca9ac1755ccf222554bfd7f949ae514a..d156f4e14aa633f8df2a58346bf9000a7bae15cc 100644 (file)
--- a/PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.cxx
+++ b/PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.cxx
@@ -31,7 +31,6 @@
 #include "AliMCEvent.h"
 #include "AliVParticle.h"
 #include "AliAODMCHeader.h"
-#include "AliEventplane.h"
 #include "TFormula.h"
 
 #include "AliAnalysisManager.h"
@@ -52,7 +51,7 @@ using namespace std;
 
 ClassImp(AliAnalyseLeadingTrackUE)
 
-//____________________________________________________________________
+//-------------------------------------------------------------------
 AliAnalyseLeadingTrackUE::AliAnalyseLeadingTrackUE() :
   TObject(),
   fDebug(0),
@@ -62,8 +61,8 @@ AliAnalyseLeadingTrackUE::AliAnalyseLeadingTrackUE() :
   fCheckMotherPDG(kTRUE),
   fTrackEtaCut(0.8),
   fTrackEtaCutMin(-1.),
-  fTrackPhiCutEvPlMin(0),
-  fTrackPhiCutEvPlMax(0),
+  fTrackPhiCutEvPlMin(0.),
+  fTrackPhiCutEvPlMax(0.),
   fTrackPtMin(0),
   fEventSelection(AliVEvent::kMB|AliVEvent::kUserDefined),
   fDCAXYCut(0),
@@ -79,14 +78,16 @@ AliAnalyseLeadingTrackUE::AliAnalyseLeadingTrackUE() :
   // constructor
 }
 
-//____________________________________________________________________
+
+//-------------------------------------------------------------------
 AliAnalyseLeadingTrackUE & AliAnalyseLeadingTrackUE::operator = (const AliAnalyseLeadingTrackUE & /*source*/)
 {
   // assignment operator
   return *this;
 }
 
-//____________________________________________________________________
+
+//-------------------------------------------------------------------
 AliAnalyseLeadingTrackUE::~AliAnalyseLeadingTrackUE()
 {
 
@@ -94,6 +95,7 @@ AliAnalyseLeadingTrackUE::~AliAnalyseLeadingTrackUE()
   
 }
 
+
 //____________________________________________________________________
 Bool_t AliAnalyseLeadingTrackUE::ApplyCuts(TObject* track)
 {
@@ -105,9 +107,9 @@ Bool_t AliAnalyseLeadingTrackUE::ApplyCuts(TObject* track)
   return kTRUE;
 }
 
+
 //____________________________________________________________________
-void AliAnalyseLeadingTrackUE::DefineESDCuts(Int_t filterbit)
-{
+void AliAnalyseLeadingTrackUE::DefineESDCuts(Int_t filterbit) {
   
   // Reproduces the cuts of the corresponding bit in the ESD->AOD filtering
   // (see $ALICE_ROOT/ANALYSIS/macros/AddTaskESDFilter.C)
@@ -217,7 +219,7 @@ TObjArray*  AliAnalyseLeadingTrackUE::FindLeadingObjects(TObject *obj)
   return tracks;
   }
 
-//____________________________________________________________________
+
 void AliAnalyseLeadingTrackUE::RemoveInjectedSignals(TObjArray* tracks, TObject* mcObj, Int_t maxLabel)
 {
   // remove injected signals (primaries above <maxLabel>)
@@ -301,7 +303,7 @@ void AliAnalyseLeadingTrackUE::RemoveInjectedSignals(TObjArray* tracks, TObject*
   AliInfo(Form("Reduced from %d to %d", before, tracks->GetEntriesFast())); 
 }
 
-//____________________________________________________________________
+//-------------------------------------------------------------------
 void AliAnalyseLeadingTrackUE::RemoveWeakDecays(TObjArray* tracks, TObject* mcObj)
 {
   // remove particles from weak decays
@@ -359,7 +361,7 @@ void AliAnalyseLeadingTrackUE::RemoveWeakDecays(TObjArray* tracks, TObject* mcOb
     AliInfo(Form("Reduced from %d to %d", before, tracks->GetEntriesFast())); 
 }
 
-//____________________________________________________________________
+//-------------------------------------------------------------------
 TObjArray* AliAnalyseLeadingTrackUE::GetAcceptedParticles(TObject* obj, TObject* arrayMC, Bool_t onlyprimaries, Int_t particleSpecies, Bool_t useEtaPtCuts, Bool_t speciesOnTracks, Double_t evtPlane)
 {
   // Returns an array of particles that pass the cuts, if arrayMC is given each reconstructed particle is replaced by its corresponding MC particles, depending on the parameter onlyprimaries only for primaries 
@@ -426,7 +428,7 @@ TObjArray* AliAnalyseLeadingTrackUE::GetAcceptedParticles(TObject* obj, TObject*
   return tracks;
 }
 
-//____________________________________________________________________
+//-------------------------------------------------------------------
 TObjArray* AliAnalyseLeadingTrackUE::GetFakeParticles(TObject* obj, TObject* arrayMC, Bool_t onlyprimaries, Int_t particleSpecies, Bool_t useEtaPtCuts)
 {
   // particleSpecies: -1 all particles are returned
@@ -493,7 +495,7 @@ TObjArray* AliAnalyseLeadingTrackUE::GetFakeParticles(TObject* obj, TObject* arr
   return pairs;
 }
 
-//____________________________________________________________________
+//-------------------------------------------------------------------
 TObjArray* AliAnalyseLeadingTrackUE::GetMinMaxRegion(TList *transv1, TList *transv2)
 {
   
@@ -528,7 +530,7 @@ TObjArray* AliAnalyseLeadingTrackUE::GetMinMaxRegion(TList *transv1, TList *tran
  return regionParticles;
 }
 
-//____________________________________________________________________
+//-------------------------------------------------------------------
 Int_t  AliAnalyseLeadingTrackUE::NParticles(TObject* obj)
 {
  
@@ -544,7 +546,7 @@ Int_t  AliAnalyseLeadingTrackUE::NParticles(TObject* obj)
         nTracks = array->GetEntriesFast();
   }else if (obj->InheritsFrom("AliAODEvent")){  // RECO AOD tracks
        AliAODEvent *aodEvent = static_cast<AliAODEvent*>(obj);
-        nTracks = aodEvent->GetNTracks();
+        nTracks = aodEvent->GetNumberOfTracks();
   }else if (obj->InheritsFrom("AliESDEvent")){  // RECO ESD tracks
        AliESDEvent *esdEvent = static_cast<AliESDEvent*>(obj);
         nTracks = esdEvent->GetNumberOfTracks();
@@ -559,7 +561,7 @@ Int_t  AliAnalyseLeadingTrackUE::NParticles(TObject* obj)
   return nTracks;
 }
 
-//____________________________________________________________________
+//-------------------------------------------------------------------
 AliVParticle*  AliAnalyseLeadingTrackUE::ParticleWithCuts(TObject* obj, Int_t ipart, Bool_t onlyprimaries, Int_t particleSpecies)
 {
   // Returns track or MC particle at position "ipart" if passes selection criteria
@@ -723,7 +725,7 @@ AliVParticle*  AliAnalyseLeadingTrackUE::ParticleWithCuts(TObject* obj, Int_t ip
          Double_t pos[2];
          Double_t covar[3];
          AliAODTrack* clone = (AliAODTrack*) part->Clone();
-         Bool_t success = clone->PropagateToDCA(vertex, aodEvent->GetHeader()->GetMagneticField(), 3, pos, covar);
+         Bool_t success = clone->PropagateToDCA(vertex, ((AliVAODHeader*)aodEvent->GetHeader())->GetMagneticField(), 3, pos, covar);
          delete clone;
          if (!success)
            return 0;
@@ -850,7 +852,8 @@ AliVParticle*  AliAnalyseLeadingTrackUE::ParticleWithCuts(TObject* obj, Int_t ip
   return part;
 }
 
-//____________________________________________________________________
+
+//-------------------------------------------------------------------
 void  AliAnalyseLeadingTrackUE::QSortTracks(TObjArray &a, Int_t first, Int_t last)
 {
   // Sort array of TObjArray of tracks by Pt using a quicksort algorithm.
@@ -972,6 +975,7 @@ TObjArray*  AliAnalyseLeadingTrackUE::SortRegions(const AliVParticle* leading, T
   
 }
 
+
 //____________________________________________________________________
 Bool_t  AliAnalyseLeadingTrackUE::TriggerSelection(const TObject* obj)
 {
@@ -1065,6 +1069,7 @@ Bool_t  AliAnalyseLeadingTrackUE::VertexSelection(const TObject* obj, Int_t ntra
 }
 
 //____________________________________________________________________
+
 Bool_t AliAnalyseLeadingTrackUE::CheckTrack(AliVParticle * part)
 {
   // check if the track status flags are set