Fixed dependencies

[u/mrichter/AliRoot.git] / PWGCF / Correlations / DPhi / AliAnalysisTaskDiHadron.cxx

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskDiHadron.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskDiHadron.cxx
old mode 100755 (executable)
new mode 100644 (file)
index f71ae1b..f481b7b
--- a/PWGCF/Correlations/DPhi/AliAnalysisTaskDiHadron.cxx
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskDiHadron.cxx
@@ -1174,12 +1174,13 @@ 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;
   for(int iTrack=0;iTrack<rTrack;iTrack++){
-    AliAODTrack *aodTrack=rAOD->GetTrack(iTrack);
+    AliAODTrack *aodTrack=dynamic_cast<AliAODTrack*>(rAOD->GetTrack(iTrack));
+    if(!aodTrack) AliFatal("Not a standard AOD");
     sPt=aodTrack->Pt();
     sEta=aodTrack->Eta();
     sPhi=aodTrack->Phi();
@@ -1205,7 +1206,7 @@ Int_t AliAnalysisTaskDiHadron::TrackCutsAOD(const AliAODEvent *rAOD, Float_t *rP
     if(fDCA2D==1&&(sb[0]*sb[0]/fMaxDCAXY/fMaxDCAXY+sb[1]*sb[1]/fMaxDCAZ/fMaxDCAZ)>1)continue;
     if(fDCA2D==2&&(0.35+0.42*std::pow(double(sPt),-0.9))<(sb[0])*sb[0])continue;
     //if(eSDtrack->GetKinkIndex(0)>0)continue;//removes kinked tracks
-    if(!aodTrack->IsPrimaryCandidate())continue;//I assume this removes kinks
+    //if(!aodTrack->IsPrimaryCandidate())continue;//I assume this removes kinks // commented out, method removed in AliAODTrack
     //if(!aodTrack->GetStatus()&AliAODTrack::kTPCrefit&&fTPCRefit)continue;//refit in TPC
     //if((fITSRefit==1||(fITSRefit==2&&sPt>5))&&!aodTrack->GetStatus()&AliAODTrack::kITSrefit)continue;//refit of its tracks either for none,all, or >5 GeV/c
     if(fDEBUG)Printf("SPD %d %d ", aodTrack->HasPointOnITSLayer(0), aodTrack->HasPointOnITSLayer(1));
@@ -2052,7 +2053,7 @@ void AliAnalysisTaskDiHadron::Exec(Option_t *)
        }
       }
       else{
-       if(fAOD->GetNTracks()<=0){
+       if(fAOD->GetNumberOfTracks()<=0){
          if(fDEBUG)Printf("Error: no tracks");
          break;
        }
@@ -2130,7 +2131,8 @@ void AliAnalysisTaskDiHadron::Exec(Option_t *)
       else tMult=fESD->GetVZEROData()->GetMTotV0A()+fESD->GetVZEROData()->GetMTotV0C();
     }
     else{
-      AliAODHeader *tHeader=fAOD->GetHeader();
+      AliAODHeader *tHeader=dynamic_cast<AliAODHeader*>(fAOD->GetHeader());
+      if(!tHeader) AliFatal("Not a standard AOD");
       tMult=tHeader->GetCentrality();
     }