AliAODEvent::GetNTracks() changed with AliAODEvent::GetNumberOfTracks()

diff --git a/PWG/muon/AliAnalysisMuonUtility.cxx b/PWG/muon/AliAnalysisMuonUtility.cxx
index 044ea1dc6092f77f27486ae9269c9896a6f84494..8a9eb4dc401ece0617f116cd541ebd8c9a06f19a 100644 (file)
--- a/PWG/muon/AliAnalysisMuonUtility.cxx
+++ b/PWG/muon/AliAnalysisMuonUtility.cxx
@@ -235,7 +235,7 @@ Int_t AliAnalysisMuonUtility::GetNTracks ( const AliVEvent* event )
   //
   /// Return the number of tracks in event
   //
-  return ( IsAODEvent(event) ) ? static_cast<const AliAODEvent*>(event)->GetNTracks() : static_cast<const AliESDEvent*>(event)->GetNumberOfMuonTracks();
+  return ( IsAODEvent(event) ) ? static_cast<const AliAODEvent*>(event)->GetNumberOfTracks() : static_cast<const AliESDEvent*>(event)->GetNumberOfMuonTracks();
 }
 
 //________________________________________________________________________

diff --git a/PWG/muon/AliAnalysisTaskCreateMixedDimuons.cxx b/PWG/muon/AliAnalysisTaskCreateMixedDimuons.cxx
index 247a2cfc12c303b9c4464cb2ebc7266c217e1405..c7bd3fa500b788fe96bb9cb128bd3dccbd0f57eb 100644 (file)
--- a/PWG/muon/AliAnalysisTaskCreateMixedDimuons.cxx
+++ b/PWG/muon/AliAnalysisTaskCreateMixedDimuons.cxx
@@ -129,8 +129,8 @@ void AliAnalysisTaskCreateMixedDimuons::UserExec(Option_t *) {
       Int_t nTracksEv[2]  = {0};
       Int_t nFWMuonsEv[2] = {0};
       
-      nTracksEv[0] = fInputAOD[iEv]->GetNTracks();
-      nTracksEv[1] = fInputAOD[jEv]->GetNTracks();
+      nTracksEv[0] = fInputAOD[iEv]->GetNumberOfTracks();
+      nTracksEv[1] = fInputAOD[jEv]->GetNumberOfTracks();
       
       for (Int_t i=0; i<nTracksEv[0]; i++) if(fInputAOD[iEv]->GetTrack(i)->IsMuonTrack()) nFWMuonsEv[0]++;
       for (Int_t i=0; i<nTracksEv[1]; i++) if(fInputAOD[jEv]->GetTrack(i)->IsMuonTrack()) nFWMuonsEv[1]++;

diff --git a/PWG/muon/AliAnalysisTaskMuonCollisionMultiplicity.cxx b/PWG/muon/AliAnalysisTaskMuonCollisionMultiplicity.cxx
index 6474768c9f84c85f78a69441ab113d154b58935e..b94aa915bacaf53a2ea402de363e4150f0eaaa5a 100644 (file)
--- a/PWG/muon/AliAnalysisTaskMuonCollisionMultiplicity.cxx
+++ b/PWG/muon/AliAnalysisTaskMuonCollisionMultiplicity.cxx
@@ -269,7 +269,7 @@ Bool_t AliAnalysisTaskMuonCollisionMultiplicity::CheckEventESD()
 void AliAnalysisTaskMuonCollisionMultiplicity::FillHistosAOD(Int_t triggerClass)
 {
   // Fill histos for AOD events
-  Int_t nTracks = fAOD->GetNTracks();
+  Int_t nTracks = fAOD->GetNumberOfTracks();
   Int_t nDimuons = fAOD->GetNDimuons();
   
   // Fill histos

diff --git a/PWG/muon/AliAnalysisTaskSEMuonsHF.cxx b/PWG/muon/AliAnalysisTaskSEMuonsHF.cxx
index c60f5f3627103d75c25bc23ff98d9aeab3bec8d0..4e23217b5ed3cba53475976004dc4b900785f800 100644 (file)
--- a/PWG/muon/AliAnalysisTaskSEMuonsHF.cxx
+++ b/PWG/muon/AliAnalysisTaskSEMuonsHF.cxx
@@ -180,7 +180,7 @@ void AliAnalysisTaskSEMuonsHF::UserExec(Option_t *)
     aod = dynamic_cast<AliAODEvent*>(InputEvent());
     if (!aod) { AliError("AOD event not found. Nothing done!"); return; }
     if (!fIsMC && (aod->GetHeader()->GetEventType()!=7)) return;
-    ntrks = aod->GetNTracks();
+    ntrks = aod->GetNumberOfTracks();
   } else {
     esd = dynamic_cast<AliESDEvent*>(InputEvent());
     if (!esd) { AliError("ESD event not found. Nothing done!"); return; }

diff --git a/PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.cxx b/PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.cxx
index e95f8685ffcadb94fda5ee1fed0011705f5ba7ea..9e55828df91fd28a93c62211b0ee80f1a578433a 100644 (file)
--- a/PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.cxx
+++ b/PWGCF/Correlations/Base/AliAnalyseLeadingTrackUE.cxx
@@ -546,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();

diff --git a/PWGCF/Correlations/Base/AliAnalysisTaskCFTree.cxx b/PWGCF/Correlations/Base/AliAnalysisTaskCFTree.cxx
index c8af7bfda035cb56feae76a3a36e5693faaf9324..c7e06cbd203e835e6e8416c81d9283f2ee4419df 100644 (file)
--- a/PWGCF/Correlations/Base/AliAnalysisTaskCFTree.cxx
+++ b/PWGCF/Correlations/Base/AliAnalysisTaskCFTree.cxx
@@ -243,8 +243,9 @@ void AliAnalysisTaskCFTree::UserExec(Option_t *){
   AliAODEvent* aod = dynamic_cast<AliAODEvent*> (fInputEvent);
   if (fMuons && aod){ // aod only
     fMuons->Clear();
-    for (Int_t iTrack = 0; iTrack < aod->GetNTracks(); iTrack++) {
-      AliAODTrack* track = aod->GetTrack(iTrack);
+    for (Int_t iTrack = 0; iTrack < aod->GetNumberOfTracks(); iTrack++) {
+      AliAODTrack* track = dynamic_cast<AliAODTrack*>(aod->GetTrack(iTrack));
+      if(!track) AliFatal("Not a standard AOD");
       if (!track->IsMuonTrack()) continue;
       Float_t pt     = track->Pt();
       Float_t eta    = track->Eta();

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTask3PCorrelations.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTask3PCorrelations.cxx
index e0350344168f2e6d835126ba36a7cb55566e5884..e5676b79dbd1cd7d74ef7dde0695e7dd08eb770a 100644 (file)
--- a/PWGCF/Correlations/DPhi/AliAnalysisTask3PCorrelations.cxx
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTask3PCorrelations.cxx
@@ -1067,7 +1067,7 @@ void  AliAnalysisTask3PCorrelations::UserExec(Option_t */*option*/)
     }
   // cout << "AliAnalysisTask3PCorrelations::UserExec(Option_t *option) - 8" << endl;
   
-  _nTracks  = fAODEvent->GetNTracks();
+  _nTracks  = fAODEvent->GetNumberOfTracks();
   _mult0    = 0;
   _mult1    = 0;
   _mult2    = 0;

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskDiHadron.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskDiHadron.cxx
index 1dccd95c4482279c0da1a13904066aae3d44c657..4b9ba1b557e7a1f07213e9596462a44a663b01f6 100644 (file)
--- a/PWGCF/Correlations/DPhi/AliAnalysisTaskDiHadron.cxx
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskDiHadron.cxx
@@ -1174,7 +1174,7 @@ Int_t AliAnalysisTaskDiHadron::TrackCutsAOD(const AliAODEvent *rAOD, Float_t *rP
   rGoodTracks[0]=0;
   Int_t lead=0;
   Float_t leadPt=0;
-  Int_t rTrack=fAOD->GetNTracks();
+  Int_t rTrack=fAOD->GetNumberOfTracks();
   Float_t sPt, sEta, sPhi, sChi, sb[2];
   Int_t sNcls, sNclsF, sITScls;
   Short_t sCharge;
@@ -2052,7 +2052,7 @@ void AliAnalysisTaskDiHadron::Exec(Option_t *)
        }
       }
       else{
-       if(fAOD->GetNTracks()<=0){
+       if(fAOD->GetNumberOfTracks()<=0){
          if(fDEBUG)Printf("Error: no tracks");
          break;
        }

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskMinijet.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskMinijet.cxx
index f417829a5c1ee537bd51713f251170928862fbf6..16a969349cb3fb96138442bedb1ad34e3342607e 100644 (file)
--- a/PWGCF/Correlations/DPhi/AliAnalysisTaskMinijet.cxx
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskMinijet.cxx
@@ -588,7 +588,7 @@ void AliAnalysisTaskMinijet::UserExec(Option_t *)
         if(fAODEvent){
             if(fSelOption==0){
                 Bool_t useEvent = false;
-                Int_t nTracks = fAODEvent->GetNTracks();
+                Int_t nTracks = fAODEvent->GetNumberOfTracks();
                 for(Int_t itrack=0; itrack<nTracks; itrack++) {
                     AliAODTrack * track = fAODEvent->GetTrack(itrack);
                     if(TESTBIT(track->GetITSClusterMap(),2) || TESTBIT(track->GetITSClusterMap(),3) ){

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
index bff2a9a3d8210c84d25ab2ba58ac2c7188538e12..6a5b810d841449a28785f0cd6ec0674a0a502df5 100644 (file)
--- a/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskPhiCorrelations.cxx
@@ -1559,7 +1559,7 @@ TObjArray* AliAnalysisTaskPhiCorrelations::GetParticlesFromDetector(AliVEvent* i
     {
       if(!fAOD)
        AliFatal("Muon selection only implemented on AOD");//FIXME to be implemented also for ESDs as in AliAnalyseLeadingTrackUE::GetAcceptedPArticles
-      for (Int_t iTrack = 0; iTrack < fAOD->GetNTracks(); iTrack++) {
+      for (Int_t iTrack = 0; iTrack < fAOD->GetNumberOfTracks(); iTrack++) {
        AliAODTrack* track = fAOD->GetTrack(iTrack);
        if (!track->IsMuonTrack()) continue;
        //Float_t dca    = track->DCA();

diff --git a/PWGCF/Correlations/DPhi/FourierDecomposition/AliMuonEffMC.cxx b/PWGCF/Correlations/DPhi/FourierDecomposition/AliMuonEffMC.cxx
index dc00fa5dad0c163109bd96fc10f508530ec96f95..8cd39568b65fd7e2c61db39069949eb83fac6619 100644 (file)
--- a/PWGCF/Correlations/DPhi/FourierDecomposition/AliMuonEffMC.cxx
+++ b/PWGCF/Correlations/DPhi/FourierDecomposition/AliMuonEffMC.cxx
@@ -504,7 +504,7 @@ void AliMuonEffMC::UserExec(Option_t *)
   {
     fAOD = dynamic_cast<AliAODEvent*>(InputEvent());
     if (!fAOD) { AliError("AOD event not found. Nothing done!"); return; }
-    ntrks = fAOD->GetNTracks();
+    ntrks = fAOD->GetNumberOfTracks();
   }
   else
   {

diff --git a/PWGCF/Correlations/DPhi/MuonHadron/AliAnalysisTaskDiMuonCorrelations.cxx b/PWGCF/Correlations/DPhi/MuonHadron/AliAnalysisTaskDiMuonCorrelations.cxx
index e8381f4417abb322edf40a4e167595fc54ff7e38..be6457e314a7ff5202e92d4a68ee1a6d23bcc3a9 100644 (file)
--- a/PWGCF/Correlations/DPhi/MuonHadron/AliAnalysisTaskDiMuonCorrelations.cxx
+++ b/PWGCF/Correlations/DPhi/MuonHadron/AliAnalysisTaskDiMuonCorrelations.cxx
@@ -423,7 +423,7 @@ TObjArray* AliAnalysisTaskDiMuonCorrelations::GetAcceptedTracksMuonArm(AliAODEve
   TObjArray *tracks = new TObjArray;
   tracks->SetOwner(kFALSE);
 
-  Int_t nTracks = aodEvent->GetNTracks();
+  Int_t nTracks = aodEvent->GetNumberOfTracks();
 
   AliAODTrack *track = 0;
   

diff --git a/PWGCF/Correlations/DPhi/MuonHadron/AliAnalysisTaskMuonHadronCorrelations.cxx b/PWGCF/Correlations/DPhi/MuonHadron/AliAnalysisTaskMuonHadronCorrelations.cxx
index da5a408f0171e5b026048eb0dcd5c6146724a3f3..652d1c6e1bd71c82c188bd0b8d3179cb6491e86a 100644 (file)
--- a/PWGCF/Correlations/DPhi/MuonHadron/AliAnalysisTaskMuonHadronCorrelations.cxx
+++ b/PWGCF/Correlations/DPhi/MuonHadron/AliAnalysisTaskMuonHadronCorrelations.cxx
@@ -456,7 +456,7 @@ TObjArray* AliAnalysisTaskMuonHadronCorrelations::GetAcceptedTracksCentralBarrel
   TObjArray *tracks = new TObjArray;
   tracks->SetOwner(kTRUE);
 
-  Int_t nTracks = aodEvent->GetNTracks();
+  Int_t nTracks = aodEvent->GetNumberOfTracks();
 
   AliAODTrack *track = 0;
 
@@ -480,7 +480,7 @@ TObjArray* AliAnalysisTaskMuonHadronCorrelations::GetAcceptedTracksMuonArm(AliAO
   TObjArray *tracks = new TObjArray;
   tracks->SetOwner(kFALSE);
 
-  Int_t nTracks = aodEvent->GetNTracks();
+  Int_t nTracks = aodEvent->GetNumberOfTracks();
 
   AliAODTrack *track = 0;
   

diff --git a/PWGCF/Correlations/DPhi/PidPid/AliAnalysisTaskPidPidCorrelations.cxx b/PWGCF/Correlations/DPhi/PidPid/AliAnalysisTaskPidPidCorrelations.cxx
index ac477f6751b4c4152cb8d52e8e4ae36f992eb1bf..d33c172b1cc04838eabe79eb8db6b5944ef99961 100644 (file)
--- a/PWGCF/Correlations/DPhi/PidPid/AliAnalysisTaskPidPidCorrelations.cxx
+++ b/PWGCF/Correlations/DPhi/PidPid/AliAnalysisTaskPidPidCorrelations.cxx
@@ -1436,7 +1436,7 @@ void AliAnalysisTaskPidPidCorrelations::CleanUp(TObjArray* tracks, TObject* mcOb
 TObjArray* AliAnalysisTaskPidPidCorrelations::AcceptTracks(Int_t centBin, TObject* arrayMC, /*Bool_t onlyprimaries,*/ Bool_t useCuts)
 {
   //_____ number of RECO AOD tracks
-  Int_t nTracks = fMyAODEvent->GetNTracks();
+  Int_t nTracks = fMyAODEvent->GetNumberOfTracks();
 //   AliDebug(5, Form("#tracks= %d %d", nTracks, centBin));
 //   AliInfo(Form("There are %d tracks in this event",nTracks));
   
@@ -1605,7 +1605,7 @@ TObjArray* AliAnalysisTaskPidPidCorrelations::AcceptMcTracks(Int_t centBin, Bool
 TObjArray* AliAnalysisTaskPidPidCorrelations::AcceptMcRecoMachedTracks(Int_t centBin, Bool_t onlyprimaries, Bool_t useCuts)
 {
   //_____ number of RECO AOD tracks
-  Int_t nTracks = fMyAODEvent->GetNTracks();
+  Int_t nTracks = fMyAODEvent->GetNumberOfTracks();
   //if(fVerbose>0) Printf("AOD tracks: %d", nTracks); //! FIXME
 
   TObjArray* tracksAccepted = new TObjArray;

diff --git a/PWGCF/FEMTOSCOPYAOD/AliAnalysisTaskPWG2AODUpdate.cxx b/PWGCF/FEMTOSCOPYAOD/AliAnalysisTaskPWG2AODUpdate.cxx
index ce5c9781a6ee6d97d1fd6f1311cb5ccccba90a3f..84927c6ec1f61a57c75e4651a9c0dd01c789fdd7 100644 (file)
--- a/PWGCF/FEMTOSCOPYAOD/AliAnalysisTaskPWG2AODUpdate.cxx
+++ b/PWGCF/FEMTOSCOPYAOD/AliAnalysisTaskPWG2AODUpdate.cxx
@@ -107,7 +107,7 @@ void AliAnalysisTaskPWG2AODUpdate::UserExec(Option_t */*option*/)
   vtx->GetXYZ(pos); // position
     
   // Tracks (primary and orphan)
-  Int_t nTracks = fAOD->GetNTracks();
+  Int_t nTracks = fAOD->GetNumberOfTracks();
 
   printf("NUMBER OF AOD TRACKS %5d\n", nTracks);
   

diff --git a/PWGHF/correlationHF/AliAnalysisTaskDStarCorrelations.cxx b/PWGHF/correlationHF/AliAnalysisTaskDStarCorrelations.cxx
index ad7530dcd0c6ec5d980a49821077dd35b32ebac1..66eb93073ff901c254d6f223248d1e5b34cdfed0 100644 (file)
--- a/PWGHF/correlationHF/AliAnalysisTaskDStarCorrelations.cxx
+++ b/PWGHF/correlationHF/AliAnalysisTaskDStarCorrelations.cxx
@@ -1449,7 +1449,7 @@ void AliAnalysisTaskDStarCorrelations::EventMixingChecks(AliAODEvent* AOD){
        
        // get the pool for event mixing
        if(fSystem != AA){ // pp
-               multiplicity = AOD->GetNTracks();
+               multiplicity = AOD->GetNumberOfTracks();
                MultipOrCent = multiplicity; // convert from Int_t to Double_t
        }
        if(fSystem == AA){ // PbPb

diff --git a/PWGHF/correlationHF/AliAnalysisTaskSED0Correlations.cxx b/PWGHF/correlationHF/AliAnalysisTaskSED0Correlations.cxx
index 409b6d76f4f9862faedd03b2aa3145a4c3b9d5ce..50e0a69cf8028afeaed1eb5c5ce4c33e51828c10 100644 (file)
--- a/PWGHF/correlationHF/AliAnalysisTaskSED0Correlations.cxx
+++ b/PWGHF/correlationHF/AliAnalysisTaskSED0Correlations.cxx
@@ -607,7 +607,7 @@ void AliAnalysisTaskSED0Correlations::UserExec(Option_t */*option*/)
   if (fIsRejectSDDClusters) { 
     Bool_t skipEvent = kFALSE;
     Int_t ntracks = 0;
-    if (aod) ntracks = aod->GetNTracks();
+    if (aod) ntracks = aod->GetNumberOfTracks();
     for(Int_t itrack=0; itrack<ntracks; itrack++) { // loop on tacks
       //    ... get the track
       AliAODTrack * track = aod->GetTrack(itrack);
@@ -668,7 +668,7 @@ void AliAnalysisTaskSED0Correlations::UserExec(Option_t */*option*/)
       }
     }
 
-    for(Int_t itrack=0; itrack<aod->GetNTracks(); itrack++) { // loop on tacks
+    for(Int_t itrack=0; itrack<aod->GetNumberOfTracks(); itrack++) { // loop on tacks
       AliAODTrack * track = aod->GetTrack(itrack);
       //rejection of tracks
       if(track->GetID() < 0) continue; //discard negative ID tracks

diff --git a/PWGHF/correlationHF/AliAnalysisTaskSEHFCJqa.cxx b/PWGHF/correlationHF/AliAnalysisTaskSEHFCJqa.cxx
index 459f43c0256189c3fee513171aa86d9b6240c3db..5e1af69e604bae602a54e9dac919ea0631fb16ed 100644 (file)
--- a/PWGHF/correlationHF/AliAnalysisTaskSEHFCJqa.cxx
+++ b/PWGHF/correlationHF/AliAnalysisTaskSEHFCJqa.cxx
@@ -396,7 +396,7 @@ void AliAnalysisTaskSEHFCJqa::UserExec(Option_t */*option*/){
   SetupPIDresponse();// this sets the pid reponse to fPPIDRespons; could also get from the cut object (AliAODPidHF::GetPidResponse)
 
   // Looping over aod tracks
-  for(Int_t j=0;j<aod->GetNTracks();j++){
+  for(Int_t j=0;j<aod->GetNumberOfTracks();j++){
 
     AliAODTrack *aodtrack=aod->GetTrack(j);
     // CHECK FILTER MAPS

diff --git a/PWGHF/correlationHF/AliDxHFECorrelation.cxx b/PWGHF/correlationHF/AliDxHFECorrelation.cxx
index ff6fbf931b0b2e7dacd866c76e7d7bebd5a1e61a..ab09c6778a7d588d9766f5a627a93b5d733fb55f 100644 (file)
--- a/PWGHF/correlationHF/AliDxHFECorrelation.cxx
+++ b/PWGHF/correlationHF/AliDxHFECorrelation.cxx
@@ -593,7 +593,7 @@ void AliDxHFECorrelation::EventMixingChecks(const AliVEvent* pEvent){
        
   // get the pool for event mixing
   if(!fSystem){ // pp
-    multiplicity = AOD->GetNTracks();
+    multiplicity = AOD->GetNumberOfTracks();
     MultipOrCent = multiplicity; // convert from Int_t to Double_t
   }
   if(fSystem){ // PbPb         

diff --git a/PWGHF/correlationHF/AliHFCorrelator.cxx b/PWGHF/correlationHF/AliHFCorrelator.cxx
index 1f0b9c807283e27f74858ebe628ea52ac9211581..54d3b7b7ee39f59d36215595491c5d5054e43c80 100644 (file)
--- a/PWGHF/correlationHF/AliHFCorrelator.cxx
+++ b/PWGHF/correlationHF/AliHFCorrelator.cxx
@@ -252,7 +252,7 @@ Bool_t AliHFCorrelator::Initialize(){
        
        // initialize the pool for event mixing
        if(!fUseCentrality){ // pp, pA
-       //multiplicity = fAODEvent->GetNTracks();
+       //multiplicity = fAODEvent->GetNumberOfTracks();
         //MultipOrCent = AliVertexingHFUtils::GetNumberOfTrackletsInEtaRange(fAODEvent,-1.,1.);
         fMultCentr = AliVertexingHFUtils::GetNumberOfTrackletsInEtaRange(fAODEvent,-1.,1.);
        //      MultipOrCent = multiplicity; // convert from Int_t to Double_t
@@ -398,7 +398,7 @@ Double_t AliHFCorrelator::SetCorrectPhiRange(Double_t phi){
 TObjArray*  AliHFCorrelator::AcceptAndReduceTracks(AliAODEvent* inputEvent){
 
   Double_t weight=1.;
-  Int_t nTracks = inputEvent->GetNTracks();
+  Int_t nTracks = inputEvent->GetNumberOfTracks();
   AliAODVertex * vtx = inputEvent->GetPrimaryVertex();
   Double_t pos[3],cov[6];
   vtx->GetXYZ(pos);

diff --git a/PWGHF/vertexingHF/AliAnalysisTaskCombinHF.cxx b/PWGHF/vertexingHF/AliAnalysisTaskCombinHF.cxx
index a950ffa43ca7362d6eb544ee6d4caea4acf8aeff..c9dba5dca4f662cf2e735bd3bc911af488f22165 100644 (file)
--- a/PWGHF/vertexingHF/AliAnalysisTaskCombinHF.cxx
+++ b/PWGHF/vertexingHF/AliAnalysisTaskCombinHF.cxx
@@ -519,9 +519,8 @@ void AliAnalysisTaskCombinHF::UserExec(Option_t */*option*/){
     }
     FillGenHistos(arrayMC);
   }
-  
-  
-  Int_t ntracks=aod->GetNTracks();
+
+  Int_t ntracks=aod->GetNumberOfTracks();
   fVtxZ = aod->GetPrimaryVertex()->GetZ();
   fMultiplicity = AliVertexingHFUtils::GetNumberOfTrackletsInEtaRange(aod,-1.,1.); 
 
@@ -529,7 +528,8 @@ void AliAnalysisTaskCombinHF::UserExec(Option_t */*option*/){
   UChar_t* status = new UChar_t[ntracks];
   for(Int_t iTr=0; iTr<ntracks; iTr++){
     status[iTr]=0;
-    AliAODTrack* track=aod->GetTrack(iTr);
+    AliAODTrack* track=dynamic_cast<AliAODTrack*>(aod->GetTrack(iTr));
+    if(!track) AliFatal("Not a standard AOD");
     if(IsTrackSelected(track)) status[iTr]+=1;
     
     // PID
@@ -577,7 +577,8 @@ void AliAnalysisTaskCombinHF::UserExec(Option_t */*option*/){
   fPionTracks->Delete();
  
   for(Int_t iTr1=0; iTr1<ntracks; iTr1++){
-    AliAODTrack* trK=aod->GetTrack(iTr1);
+    AliAODTrack* trK=dynamic_cast<AliAODTrack*>(aod->GetTrack(iTr1));
+    if(!trK) AliFatal("Not a standard AOD");
     if((status[iTr1] & 1)==0) continue;
     if(fDoEventMixing){
       if(status[iTr1] & 2) fKaonTracks->AddLast(new TLorentzVector(trK->Px(),trK->Py(),trK->Pz(),trK->Charge()));
@@ -594,7 +595,8 @@ void AliAnalysisTaskCombinHF::UserExec(Option_t */*option*/){
       if((status[iTr2] & 1)==0) continue;
       if((status[iTr2] & 4)==0) continue;
       if(iTr1==iTr2) continue;
-      AliAODTrack* trPi1=aod->GetTrack(iTr2);
+      AliAODTrack* trPi1=dynamic_cast<AliAODTrack*>(aod->GetTrack(iTr2));
+      if(!trPi1) AliFatal("Not a standard AOD");
       Int_t chargePi1=trPi1->Charge();
       trPi1->GetPxPyPz(tmpp);
       px[1] = tmpp[0];
@@ -618,7 +620,8 @@ void AliAnalysisTaskCombinHF::UserExec(Option_t */*option*/){
           if((status[iTr3] & 1)==0) continue;
           if((status[iTr3] & 4)==0) continue;
           if(iTr1==iTr3) continue;
-          AliAODTrack* trPi2=aod->GetTrack(iTr3);
+          AliAODTrack* trPi2=dynamic_cast<AliAODTrack*>(aod->GetTrack(iTr3));
+          if(!trPi2) AliFatal("Not a standard AOD");
           Int_t chargePi2=trPi2->Charge();
           if(chargePi2==chargeK) continue;
           nFiltered++;

diff --git a/PWGHF/vertexingHF/AliAnalysisTaskSED0Mass.cxx b/PWGHF/vertexingHF/AliAnalysisTaskSED0Mass.cxx
index 496a00c642402a5456158092385b0e6057cf22b7..9d44447100ec94c3fa095d15efc571e40c6444e0 100644 (file)
--- a/PWGHF/vertexingHF/AliAnalysisTaskSED0Mass.cxx
+++ b/PWGHF/vertexingHF/AliAnalysisTaskSED0Mass.cxx
@@ -1079,7 +1079,7 @@ void AliAnalysisTaskSED0Mass::UserExec(Option_t */*option*/)
   if (fIsRejectSDDClusters) { 
     Bool_t skipEvent = kFALSE;
     Int_t ntracks = 0;
-    if (aod) ntracks = aod->GetNTracks();
+    if (aod) ntracks = aod->GetNumberOfTracks();
     for(Int_t itrack=0; itrack<ntracks; itrack++) { // loop on tacks
       //    ... get the track
       AliAODTrack * track = aod->GetTrack(itrack);

diff --git a/PWGHF/vertexingHF/AliAnalysisTaskSEDStarSpectra.cxx b/PWGHF/vertexingHF/AliAnalysisTaskSEDStarSpectra.cxx
index fe115033a3824a63634026454cfa0a808f2f7696..3fafdfe1674b852f3c0045f5ba44357bc042fc95 100644 (file)
--- a/PWGHF/vertexingHF/AliAnalysisTaskSEDStarSpectra.cxx
+++ b/PWGHF/vertexingHF/AliAnalysisTaskSEDStarSpectra.cxx
@@ -439,7 +439,7 @@ void AliAnalysisTaskSEDStarSpectra::UserExec(Option_t *)
       TLorentzVector lorentzTrack1(0,0,0,0); // lorentz 4 vector
       TLorentzVector lorentzTrack2(0,0,0,0); // lorentz 4 vector
       
-      for (Int_t i=0; i<aodEvent->GetNTracks(); i++){ 
+      for (Int_t i=0; i<aodEvent->GetNumberOfTracks(); i++){ 
        
        AliAODTrack* aodTrack = aodEvent->GetTrack(i);
        

diff --git a/PWGHF/vertexingHF/AliAnalysisTaskSEDplus.cxx b/PWGHF/vertexingHF/AliAnalysisTaskSEDplus.cxx
index 1e4bb131c157fad5a49353ca440983adafcacff8..2b1024fa236d915ea6e75471ccc8b6f8beb01d87 100644 (file)
--- a/PWGHF/vertexingHF/AliAnalysisTaskSEDplus.cxx
+++ b/PWGHF/vertexingHF/AliAnalysisTaskSEDplus.cxx
@@ -784,7 +784,7 @@ void AliAnalysisTaskSEDplus::UserExec(Option_t */*option*/)
 
   //Event selection
   Bool_t isEvSel=fRDCutsAnalysis->IsEventSelected(aod);
-  Float_t ntracks=aod->GetNTracks();
+  Float_t ntracks=aod->GetNumberOfTracks();
   Float_t evCentr=0;
   if(fRDCutsAnalysis->GetUseCentrality()>0) evCentr=fRDCutsAnalysis->GetCentrality(aod);
   fHistCentrality[0]->Fill(ntracks,evCentr);

diff --git a/PWGHF/vertexingHF/AliAnalysisTaskSEDs.cxx b/PWGHF/vertexingHF/AliAnalysisTaskSEDs.cxx
index 7730ac5e7739af896ead2d715bc147d17356f076..92df225d9a492792af05607a81db534b7707cb88 100644 (file)
--- a/PWGHF/vertexingHF/AliAnalysisTaskSEDs.cxx
+++ b/PWGHF/vertexingHF/AliAnalysisTaskSEDs.cxx
@@ -513,7 +513,7 @@ void AliAnalysisTaskSEDs::UserExec(Option_t */*option*/)
   
 
   Bool_t isEvSel=fAnalysisCuts->IsEventSelected(aod);
-  Float_t ntracks=aod->GetNTracks();
+  Float_t ntracks=aod->GetNumberOfTracks();
   Float_t evCentr=fAnalysisCuts->GetCentrality(aod);
   
   fHistCentrality[0]->Fill(evCentr);

diff --git a/PWGHF/vertexingHF/AliAnalysisTaskSEHFQA.cxx b/PWGHF/vertexingHF/AliAnalysisTaskSEHFQA.cxx
index 3b7acc0844689dda444009b5d716160a09fe084b..6fe3ffa0ce2fa4405913e09f276b1294814984ee 100644 (file)
--- a/PWGHF/vertexingHF/AliAnalysisTaskSEHFQA.cxx
+++ b/PWGHF/vertexingHF/AliAnalysisTaskSEHFQA.cxx
@@ -1320,7 +1320,7 @@ void AliAnalysisTaskSEHFQA::UserExec(Option_t */*option*/)
   Double_t multiplicity=aod->GetHeader()->GetRefMultiplicity();
   Int_t runNumber = aod->GetRunNumber();
   TString trigClass=aod->GetFiredTriggerClasses();
-  Int_t nAODtracks=aod->GetNTracks();
+  Int_t nAODtracks=aod->GetNumberOfTracks();
   Int_t nSelTracksTPCOnly=0;
   Int_t nSelTracksTPCITS=0;
   Int_t nSelTracksTPCITS1SPD=0;
@@ -1835,7 +1835,7 @@ void AliAnalysisTaskSEHFQA::UserExec(Option_t */*option*/)
   Int_t ntracks=0;
   Int_t isGoodTrack=0, isFakeTrack=0, isSelTrack=0;
 
-  if(aod) ntracks=aod->GetNTracks();
+  if(aod) ntracks=aod->GetNumberOfTracks();
 
   if(fOnOff[0] || fOnOff[1]){
     //loop on tracks in the event

diff --git a/PWGHF/vertexingHF/AliAnalysisTaskSELambdac.cxx b/PWGHF/vertexingHF/AliAnalysisTaskSELambdac.cxx
index eb823609cde2e61d3af62ea5ef491e7aec6d3e12..ac329759799bade8d11fba26b0754136ab9dab12 100644 (file)
--- a/PWGHF/vertexingHF/AliAnalysisTaskSELambdac.cxx
+++ b/PWGHF/vertexingHF/AliAnalysisTaskSELambdac.cxx
@@ -1384,10 +1384,10 @@ void AliAnalysisTaskSELambdac::UserExec(Option_t */*option*/)
 
   if (fMultiplicityHists && fReadMC) {
     fillthis="hPrimariesvsAOD";
-    ((TH1I*)fMultiplicity->FindObject(fillthis))->Fill(aod->GetNTracks(),numberOfPrimaries);
+    ((TH1I*)fMultiplicity->FindObject(fillthis))->Fill(aod->GetNumberOfTracks(),numberOfPrimaries);
 
     fillthis="hAll2MultiplicityInEvent";
-    ((TH1I*)fMultiplicity->FindObject(fillthis))->Fill(aod->GetNTracks());
+    ((TH1I*)fMultiplicity->FindObject(fillthis))->Fill(aod->GetNumberOfTracks());
 
     fillthis="hAll2MultiplicityPrimaryInEvent";
     ((TH1I*)fMultiplicity->FindObject(fillthis))->Fill(numberOfPrimaries);
@@ -1493,7 +1493,7 @@ void AliAnalysisTaskSELambdac::UserExec(Option_t */*option*/)
 
   if (fMultiplicityHists && fReadMC) {
     fillthis="hAllMultiplicityInEvent";
-    ((TH1I*)fMultiplicity->FindObject(fillthis))->Fill(aod->GetNTracks());
+    ((TH1I*)fMultiplicity->FindObject(fillthis))->Fill(aod->GetNumberOfTracks());
 
     fillthis="hAllMultiplicityPrimaryInEvent";
     ((TH1I*)fMultiplicity->FindObject(fillthis))->Fill(numberOfPrimaries);
@@ -3303,7 +3303,7 @@ Int_t AliAnalysisTaskSELambdac::NumberPrimaries(const AliAODEvent *aods)
   
   TClonesArray *aodtracks=(TClonesArray *)aods->GetTracks();
  
-  // for(Int_t ji=0;ji<aods->GetNTracks();ji++)
+  // for(Int_t ji=0;ji<aods->GetNumberOfTracks();ji++)
   for(Int_t ji=0;ji<aodtracks->GetEntriesFast();ji++)
     {
       AliAODTrack*aodTrack=(AliAODTrack*)aodtracks->UncheckedAt(ji);

diff --git a/PWGHF/vertexingHF/AliRDHFCuts.cxx b/PWGHF/vertexingHF/AliRDHFCuts.cxx
index ace5f0bc8b2a499520822247508b7076fce8b655..8810918d0ed7fd3d8a1d466eae57a19aa6b6ff55 100644 (file)
--- a/PWGHF/vertexingHF/AliRDHFCuts.cxx
+++ b/PWGHF/vertexingHF/AliRDHFCuts.cxx
@@ -488,7 +488,7 @@ Bool_t AliRDHFCuts::IsEventSelected(AliVEvent *event) {
   }
 
   // TEMPORARY FIX FOR GetEvent
-  Int_t nTracks=((AliAODEvent*)event)->GetNTracks();
+  Int_t nTracks=((AliAODEvent*)event)->GetNumberOfTracks();
   for(Int_t itr=0; itr<nTracks; itr++){
     AliAODTrack* tr=(AliAODTrack*)((AliAODEvent*)event)->GetTrack(itr);
     tr->SetAODEvent((AliAODEvent*)event);

diff --git a/STEER/AOD/AliAODEvent.cxx b/STEER/AOD/AliAODEvent.cxx
index 72099e929d5645b3445a6f5bc8ccebf49d89082b..fd48bd6937316d150dd3b195a3c669309dbc14b5 100644 (file)
--- a/STEER/AOD/AliAODEvent.cxx
+++ b/STEER/AOD/AliAODEvent.cxx
@@ -618,7 +618,7 @@ Int_t AliAODEvent::GetMuonTracks(TRefArray *muonTracks) const
   muonTracks->Clear();
 
   AliAODTrack *track = 0;
-  for (Int_t iTrack = 0; iTrack < GetNTracks(); iTrack++) {
+  for (Int_t iTrack = 0; iTrack < GetNumberOfTracks(); iTrack++) {
     track = GetTrack(iTrack);
     if (track->IsMuonTrack()) {
       muonTracks->Add(track);
@@ -634,7 +634,7 @@ Int_t AliAODEvent::GetNumberOfMuonTracks() const
 {
   // get number of muon tracks
   Int_t nMuonTracks=0;
-  for (Int_t iTrack = 0; iTrack < GetNTracks(); iTrack++) {
+  for (Int_t iTrack = 0; iTrack < GetNumberOfTracks(); iTrack++) {
     if ((GetTrack(iTrack))->IsMuonTrack()) {
        nMuonTracks++;
     }
@@ -651,7 +651,7 @@ Int_t AliAODEvent::GetMuonGlobalTracks(TRefArray *muonGlobalTracks) const
   muonGlobalTracks->Clear();
 
   AliAODTrack *track = 0;
-  for (Int_t iTrack = 0; iTrack < GetNTracks(); iTrack++) {
+  for (Int_t iTrack = 0; iTrack < GetNumberOfTracks(); iTrack++) {
     track = GetTrack(iTrack);
     if (track->IsMuonGlobalTrack()) {
       muonGlobalTracks->Add(track);
@@ -667,7 +667,7 @@ Int_t AliAODEvent::GetNumberOfMuonGlobalTracks() const
 {
   // get number of muon global tracks
   Int_t nMuonGlobalTracks=0;
-  for (Int_t iTrack = 0; iTrack < GetNTracks(); iTrack++) {
+  for (Int_t iTrack = 0; iTrack < GetNumberOfTracks(); iTrack++) {
     if ((GetTrack(iTrack))->IsMuonGlobalTrack()) {
        nMuonGlobalTracks++;
     }

diff --git a/STEER/AOD/AliAODEvent.h b/STEER/AOD/AliAODEvent.h
index 5497f1aaab4c7366cd226e9b743528f749e07c0d..ac094d10206c4797e533f4a98c3facfb174146a6 100644 (file)
--- a/STEER/AOD/AliAODEvent.h
+++ b/STEER/AOD/AliAODEvent.h
@@ -141,8 +141,7 @@ class AliAODEvent : public AliVEvent {
   // -- Tracks
   TClonesArray *GetTracks()              const { return fTracks; }
   void          ConnectTracks();
-  Int_t         GetNTracks()             const { return fTracks? fTracks->GetEntriesFast() : 0; }
-  Int_t         GetNumberOfTracks()      const { return GetNTracks(); }
+  Int_t         GetNumberOfTracks()      const { return fTracks? fTracks->GetEntriesFast() : 0; }
   AliAODTrack  *GetTrack(Int_t nTrack)   const { return fTracks ? (AliAODTrack*)fTracks->UncheckedAt(nTrack):0; }
   Int_t         AddTrack(const AliAODTrack* trk);
   Int_t         GetMuonTracks(TRefArray *muonTracks) const;

diff --git a/STEER/AOD/AliAODHandler.cxx b/STEER/AOD/AliAODHandler.cxx
index 36a463833d7f1222e0427906bd50dd2dd8bbf954..fdd94f5e208d4d64511bcb3c4f968cc7097d59dc 100644 (file)
--- a/STEER/AOD/AliAODHandler.cxx
+++ b/STEER/AOD/AliAODHandler.cxx
@@ -392,7 +392,7 @@ void AliAODHandler::StoreMCParticles(){
   TClonesArray* tracks = fAODEvent->GetTracks();
   Int_t tofLabel[3];
   if(tracks){
-    for(int it = 0; it < fAODEvent->GetNTracks();++it){
+    for(int it = 0; it < fAODEvent->GetNumberOfTracks();++it){
       AliAODTrack *track = fAODEvent->GetTrack(it);
       
       Int_t sign = 1;

diff --git a/STEER/AOD/AliAODTagCreator.cxx b/STEER/AOD/AliAODTagCreator.cxx
index faaa0971196e5c8c68d46288c3922d5a7de9445f..fe358a76c8e77ba72cb06e7729656d43dd2dab39 100644 (file)
--- a/STEER/AOD/AliAODTagCreator.cxx
+++ b/STEER/AOD/AliAODTagCreator.cxx
@@ -464,7 +464,7 @@ void AliAODTagCreator::FillEventTag(AliAODEvent* aod, AliEventTag* evTag)
        if(vertex->GetType() == 2) nV0s      += 1;
        if(vertex->GetType() == 3) nCascades += 1;
     }
-    Int_t nTracks = fAODEvent->GetNTracks();
+    Int_t nTracks = fAODEvent->GetNumberOfTracks();
     for (Int_t nTr = 0; nTr < nTracks; nTr++) {
        AliAODTrack *track = fAODEvent->GetTrack(nTr);