Add possibility to read HIJING MC information, removed on FF configuration from the...

diff --git a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx
index b8778a88585eaa02016e5eb7a391d27061eddfe4..46a73097b0f3e876df2e3c773a42f31cbb4cc29a 100644 (file)
--- a/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx
+++ b/PWG4/JetTasks/AliAnalysisTaskFragmentationFunction.cxx
@@ -37,6 +37,7 @@
 #include "AliAODMCParticle.h"
 #include "AliAODJet.h"
 #include "AliGenPythiaEventHeader.h"
+#include "AliGenHijingEventHeader.h"
 #include "AliInputEventHandler.h"
 
 #include "AliAnalysisHelperJetTasks.h"
@@ -2266,22 +2267,33 @@ void AliAnalysisTaskFragmentationFunction::UserExec(Option_t *)
   Double_t nTrials = 1; // trials for MC trigger weight for real data
   
   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();
+     AliGenEventHeader* genHeader = fMCEvent->GenEventHeader();
+     AliGenPythiaEventHeader*  pythiaGenHeader = dynamic_cast<AliGenPythiaEventHeader*>(genHeader);
+     AliGenHijingEventHeader*  hijingGenHeader = 0x0;
+
+     if(pythiaGenHeader){
+        if(fDebug>3) Printf("%s:%d pythiaGenHeader found", (char*)__FILE__,__LINE__);
+        nTrials = pythiaGenHeader->Trials();
+        ptHard  = pythiaGenHeader->GetPtHard();
+
+        fh1PtHard->Fill(ptHard);
+        fh1PtHardTrials->Fill(ptHard,nTrials);
+
 
-        fh1PtHard->Fill(ptHard);
-        fh1PtHardTrials->Fill(ptHard,nTrials);
+     } else { // no pythia, hijing?
 
-        fh1Trials->Fill("#sum{ntrials}",fAvgTrials);
+        if(fDebug>3) Printf("%s:%d no pythiaGenHeader found", (char*)__FILE__,__LINE__);
+
+         hijingGenHeader = dynamic_cast<AliGenHijingEventHeader*>(genHeader);
+         if(!hijingGenHeader){
+            Printf("%s:%d no pythiaGenHeader or hjingGenHeader found", (char*)__FILE__,__LINE__);
+         } else {
+           if(fDebug>3) Printf("%s:%d hijingGenHeader found", (char*)__FILE__,__LINE__);
+        }
      }
-   }
+
+     fh1Trials->Fill("#sum{ntrials}",fAvgTrials);
+  }
   
   
   //___ fetch jets __________________________________________________________________________
@@ -3042,11 +3054,38 @@ Int_t AliAnalysisTaskFragmentationFunction::GetListOfJets(TList *list, Int_t typ
       if(fDebug>1) Printf("%s:%d no mcEvent",(char*)__FILE__,__LINE__);
       return 0;
     }
-    
-    AliGenPythiaEventHeader*  pythiaGenHeader = AliAnalysisHelperJetTasks::GetPythiaEventHeader(fMCEvent);
+   
+    AliGenEventHeader* genHeader = fMCEvent->GenEventHeader();
+    AliGenPythiaEventHeader*  pythiaGenHeader = dynamic_cast<AliGenPythiaEventHeader*>(genHeader);
+    AliGenHijingEventHeader*  hijingGenHeader = 0x0;
+
     if(!pythiaGenHeader){
-      Printf("%s:%d no pythiaGenHeader found", (char*)__FILE__,__LINE__);
-      return 0;
+      hijingGenHeader = dynamic_cast<AliGenHijingEventHeader*>(genHeader);
+      
+      if(!hijingGenHeader){
+         Printf("%s:%d no pythiaGenHeader or hijingGenHeader found", (char*)__FILE__,__LINE__);
+         return 0;
+      }else{
+         TLorentzVector mom[4];
+         AliAODJet* jet[4];
+         hijingGenHeader->GetJets(mom[0], mom[1], mom[2], mom[3]);
+
+         for(Int_t i=0; i<2; ++i){
+           if(!mom[i].Pt()) continue;
+            jet[i] = new AliAODJet(mom[i]);
+
+            if( type == kJetsKineAcceptance &&
+                (    jet[i]->Eta() < fJetEtaMin
+                  || jet[i]->Eta() > fJetEtaMax
+                  || jet[i]->Phi() < fJetPhiMin
+                  || jet[i]->Phi() > fJetPhiMax )) continue;
+
+           list->Add(jet[i]);
+           nGenJets++;
+        }
+        list->Sort();
+         return nGenJets;
+      }
     }
     
     // fetch the pythia generated jets

diff --git a/PWG4/macros/AnalysisTrainPWG4Jets.C b/PWG4/macros/AnalysisTrainPWG4Jets.C
index 5e04009cc4f3d42fc616f43674c34859d0d9c467..a97e257722a03294bffbecc2b2ea5eac7d5cf6cc 100644 (file)
--- a/PWG4/macros/AnalysisTrainPWG4Jets.C
+++ b/PWG4/macros/AnalysisTrainPWG4Jets.C
@@ -484,7 +484,7 @@ void AnalysisTrainPWG4Jets(const char *analysis_mode="local",
      if(kUseAODMC){
        taskFrag = AddTaskFragmentationFunction(1<<1,kHighPtFilterMask);
        taskFrag = AddTaskFragmentationFunction(1<<2,kHighPtFilterMask);
-       taskFrag = AddTaskFragmentationFunction(1<<3,kHighPtFilterMask);
+       //       taskFrag = AddTaskFragmentationFunction(1<<3,kHighPtFilterMask);
        taskFrag = AddTaskFragmentationFunction(1<<5,kHighPtFilterMask);
        taskFrag = AddTaskFragmentationFunction(1<<11);  // w/o acceptance cuts       
        taskFrag =  AddTaskFragmentationFunction(1<<12);  // with acceptance cuts