Merge branch 'master_patch'

[u/mrichter/AliRoot.git] / PWGJE / AliAnalysisTaskJetSpectrum2.cxx

diff --git a/PWGJE/AliAnalysisTaskJetSpectrum2.cxx b/PWGJE/AliAnalysisTaskJetSpectrum2.cxx
index fc28f6fc845714cd4bf66d471cb5d9f406d55371..158a8f347f2bbfedace7cb46274da43f8c4f80d9 100644 (file)
--- a/PWGJE/AliAnalysisTaskJetSpectrum2.cxx
+++ b/PWGJE/AliAnalysisTaskJetSpectrum2.cxx
@@ -141,12 +141,11 @@ AliAnalysisTaskSE(),
   fh2deltaPt1Pt2(0x0),
   fh2RelPtFGen(0x0),
   fh3RelPtFGenLeadTrkPt(0x0),
-  fHistList(0x0),
   fh1EvtSelection(0),
   fMaxVertexZ(100.),
   fMinNcontributors(0),
-  fRejectPileup(0)
-  
+  fRejectPileup(0),
+  fHistList(0x0)  
 {
 
   for(int ij = 0;ij <kJetTypes;++ij){    
@@ -257,11 +256,11 @@ AliAnalysisTaskJetSpectrum2::AliAnalysisTaskJetSpectrum2(const char* name):
   fh2deltaPt1Pt2(0x0),
   fh2RelPtFGen(0x0),
   fh3RelPtFGenLeadTrkPt(0x0),
-  fHistList(0x0),
   fh1EvtSelection(0),
   fMaxVertexZ(100.),
   fMinNcontributors(0),
-  fRejectPileup(0)
+  fRejectPileup(0),
+  fHistList(0x0)
 {
 
   for(int ij = 0;ij <kJetTypes;++ij){    
@@ -965,9 +964,11 @@ void AliAnalysisTaskJetSpectrum2::UserExec(Option_t */*option*/){
   //  CalculateReactionPlaneAngle(&recParticles);
   fRPAngle = 0;
   
-  if(fRPMethod==0)fRPAngle = aod->GetHeader()->GetEventplane();
+  if(fRPMethod==0)fRPAngle = ((AliVAODHeader*)aod->GetHeader())->GetEventplane();
   else if(fRPMethod==1||fRPMethod==2){
-    fRPAngle = aod->GetHeader()->GetQTheta(fRPMethod);
+    AliAODHeader * aodheader = dynamic_cast<AliAODHeader*>(aod->GetHeader());
+    if(!aodheader) AliFatal("Not a standard AOD");
+    fRPAngle = aodheader->GetQTheta(fRPMethod);
   }
   fh1RP->Fill(fRPAngle);
   fh2RPCentrality->Fill(fCentrality,fRPAngle);
@@ -1589,7 +1590,8 @@ Int_t  AliAnalysisTaskJetSpectrum2::GetListOfTracks(TList *list,Int_t type){
       return iCount;
     }
     for(int it = 0;it < aod->GetNumberOfTracks();++it){
-      AliAODTrack *tr = aod->GetTrack(it);
+      AliAODTrack *tr = dynamic_cast<AliAODTrack*>(aod->GetTrack(it));
+      if(!tr) AliFatal("Not a standard AOD");
       if((fFilterMask>0)&&!(tr->TestFilterBit(fFilterMask)))continue;
       if(TMath::Abs(tr->Eta())>fTrackRecEtaWindow)continue;
       if(tr->Pt()<fMinTrackPt)continue;
@@ -1672,7 +1674,7 @@ Float_t AliAnalysisTaskJetSpectrum2::GetCentrality(){
   if(!aod){
     return 101;
   }
-  return aod->GetHeader()->GetCentrality();
+  return ((AliVAODHeader*)aod->GetHeader())->GetCentrality();
 }