Merge branch 'feature-movesplit'

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

diff --git a/PWGCF/Correlations/Base/AliAnalysisTaskCFTree.cxx b/PWGCF/Correlations/Base/AliAnalysisTaskCFTree.cxx
index c8af7bfda035cb56feae76a3a36e5693faaf9324..08b51714bfc3387391fd4ffa9455191edcee372f 100644 (file)
--- a/PWGCF/Correlations/Base/AliAnalysisTaskCFTree.cxx
+++ b/PWGCF/Correlations/Base/AliAnalysisTaskCFTree.cxx
@@ -243,8 +243,12 @@ 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) {
+        AliWarning("Not a standard AOD");
+        continue;
+      }
       if (!track->IsMuonTrack()) continue;
       Float_t pt     = track->Pt();
       Float_t eta    = track->Eta();
@@ -278,6 +282,7 @@ void AliAnalysisTaskCFTree::UserExec(Option_t *){
       label = mcpart->GetMother();
       while (!isPrimary && label>=0) {
         mcpart = (AliVParticle*) fMCEvent->GetTrack(label);
+        if (!mcpart) continue;
         label = mcpart->GetMother();
         isPrimary = fMCEvent->IsPhysicalPrimary(label);
       }