Added protection, fixed dynamic cast

diff --git a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx b/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
index db6d50f1da94cf6a47fdcd5a384f6a7fa85ae02e..aaf3800799757f5f01b83a3e1ad1e9f5786639a1 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
+++ b/PWG4/JetTasks/AliAnalysisHelperJetTasks.cxx
@@ -33,6 +33,7 @@ Int_t AliAnalysisHelperJetTasks::fgLastProcessType = -1;
  
 AliGenPythiaEventHeader*  AliAnalysisHelperJetTasks::GetPythiaEventHeader(AliMCEvent *mcEvent){
   
+  if(!mcEvent)return 0;
   AliGenEventHeader* genHeader = mcEvent->GenEventHeader();
   AliGenPythiaEventHeader* pythiaGenHeader = dynamic_cast<AliGenPythiaEventHeader*>(genHeader);
   if(!pythiaGenHeader){

diff --git a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx
index ce780956c8062941eeeeada39b97bba5d0d6b280..adf008c116fad3e7ec313883859847bac61d3232 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx
@@ -42,6 +42,8 @@
 #include "AliAnalysisHelperJetTasks.h"
 #include "AliAnalysisManager.h"
 #include "AliAnalysisTaskSE.h"
+#include "AliVParticle.h"
+#include "AliVEvent.h"
 
 #include "AliAnalysisTaskFragmentationFunction.h"
 
@@ -2306,20 +2308,22 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *)
 
   Double_t ptHard = 0.;
   Double_t nTrials = 1; // trials for MC trigger weight for real data
- 
-  AliGenPythiaEventHeader*  pythiaGenHeader = AliAnalysisHelperJetTasks::GetPythiaEventHeader(fMCEvent);
-  if(!pythiaGenHeader){
-     if(fJetTypeGen != kJetsUndef && fTrackTypeGen != kTrackUndef){
-        Printf("%s:%d no pythiaGenHeader found", (char*)__FILE__,__LINE__);
-        return;
-     }
-  } else {
-     nTrials = pythiaGenHeader->Trials();
-     ptHard  = pythiaGenHeader->GetPtHard();
+  
+  if(fMCEvent){
+     AliGenPythiaEventHeader*  pythiaGenHeader = AliAnalysisHelperJetTasks::GetPythiaEventHeader(fMCEvent);
+     if(!pythiaGenHeader){
+        if(fJetTypeGen != kJetsUndef && fTrackTypeGen != kTrackUndef){
+           Printf("%s:%d no pythiaGenHeader found", (char*)__FILE__,__LINE__);
+           return;
+        }
+     } else {
+        nTrials = pythiaGenHeader->Trials();
+        ptHard  = pythiaGenHeader->GetPtHard();
 
-     fh1PtHard->Fill(ptHard);
-     fh1PtHardTrials->Fill(ptHard,nTrials);
-  }
+        fh1PtHard->Fill(ptHard);
+        fh1PtHardTrials->Fill(ptHard,nTrials);
+     }
+   }
   
   
   //___ fetch jets __________________________________________________________________________
@@ -2746,7 +2750,7 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *)
         {
           if (it < jettracklist1->GetSize())
          { 
-           Float_t trackPt1 = (dynamic_cast<AliAODTrack*>(jettracklist1->At(it)))->Pt();
+           Float_t trackPt1 = (dynamic_cast<AliVParticle*>(jettracklist1->At(it)))->Pt();
            Float_t jetPt1 = jet1->Pt();
 
             Bool_t incrementJetPt = (it==0) ? kTRUE : kFALSE;
@@ -2765,10 +2769,10 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *)
            fFFDiJetHistosGenLeading->FillDiJetFF( 1, trackPt1, leadTrackPt1, jetBin, incrementJetPt);
            fFFDiJetHistosGenLeading->FillDiJetFF( 0, trackPt1, leadTrackPt1, jetBin, incrementJetPt);
          }
-      
+         
           if (it < jettracklist2->GetSize())
          { 
-           Float_t trackPt2 = (dynamic_cast<AliAODTrack*>(jettracklist2->At(it)))->Pt();
+           Float_t trackPt2 = (dynamic_cast<AliVParticle*>(jettracklist2->At(it)))->Pt();
            Float_t jetPt2 = jet2->Pt();
 
             Bool_t incrementJetPt = (it==0) ? kTRUE : kFALSE;