Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGJE / UserTasks / AliAnalysisTaskJetShape.cxx

diff --git a/PWGJE/UserTasks/AliAnalysisTaskJetShape.cxx b/PWGJE/UserTasks/AliAnalysisTaskJetShape.cxx
index 77829e3dc067bedf747391ddad8661e6051512f9..a343f7ebd982fd8c814a1e1461bc75845799b0b0 100644 (file)
--- a/PWGJE/UserTasks/AliAnalysisTaskJetShape.cxx
+++ b/PWGJE/UserTasks/AliAnalysisTaskJetShape.cxx
@@ -1404,7 +1404,8 @@ Bool_t AliAnalysisTaskJetShape::AliAnalysisTaskJetShapeHM::AddEvent(AliAODEvent*
       }
     else 
       {
-       AliAODTrack *tr = aodE->GetTrack(it);
+       AliAODTrack *tr = dynamic_cast<AliAODTrack*>(aodE->GetTrack(it));
+       if(!tr) AliFatal("Not a standard AOD");
        if(!tr) continue;
        if((fFilterMask>0)&&!(tr->TestFilterBit(fFilterMask)))continue;
        label = tr->GetLabel();
@@ -1505,7 +1506,8 @@ Bool_t AliAnalysisTaskJetShape::AliAnalysisTaskJetShapeHM::AddEvent(AliAODEvent*
        }
       else 
        {
-         AliAODTrack *tr = aodE->GetTrack(IndexArray[it]);
+         AliAODTrack *tr = dynamic_cast<AliAODTrack*>(aodE->GetTrack(IndexArray[it]));
+         if(!tr) AliFatal("Not a standard AOD");
          if(!tr) continue;
           AliAODTrack tmp(*tr);
           tmp.PropagateToDCA(primVtx, bfield, 5., dca, cov);
@@ -2032,7 +2034,8 @@ if(!aodH){
 
       for(int it = 0;it < aodE->GetNumberOfTracks(); it++)
        {
-         AliAODTrack *tr = aodE->GetTrack(it);
+         AliAODTrack *tr = dynamic_cast<AliAODTrack*>(aodE->GetTrack(it));
+         if(!tr) AliFatal("Not a standard AOD");
          if(!tr) continue;
          if((fFilterMask>0)&&!(tr->TestFilterBit(fFilterMask))) continue;
          if(TMath::Abs(tr->Eta())>1.) continue;