make work the jet events rejection method for AODs

diff --git a/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx b/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
index 61f4a770bbb3336e6f449a41da8db07d848aacdb..c56527835b8bc2e82fb15eb2f5a4f740b043d9b1 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
+++ b/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
@@ -159,7 +159,8 @@ Bool_t AliCaloTrackReader::ComparePtHardAndJetPt()
 {
   // Check the event, if the requested ptHard is much larger than the jet pT, then there is a problem.
   // Only for PYTHIA.
-  if(!fReadStack) return kTRUE; //Information not filtered to AOD
+  
+  //printf("AliCaloTrackReader::ComparePtHardAndJetPt() - GenHeaderName : %s\n",GetGenEventHeader()->ClassName());
   
   if(!strcmp(GetGenEventHeader()->ClassName(), "AliGenPythiaEventHeader"))
   {
@@ -168,21 +169,27 @@ Bool_t AliCaloTrackReader::ComparePtHardAndJetPt()
     Int_t nTriggerJets =  pygeh->NTriggerJets();
     Float_t ptHard = pygeh->GetPtHard();
     
-    //if(fDebug > 1) printf("AliMCAnalysisUtils::PythiaEventHeader: Njets: %d, pT Hard %f\n",nTriggerJets, ptHard);
+    if(fDebug > 1) 
+      printf("AliCaloTrackReader::ComparePtHardAndJetPt() - Njets: %d, pT Hard %f\n",nTriggerJets, ptHard);
+    
     Float_t tmpjet[]={0,0,0,0};
     for(Int_t ijet = 0; ijet< nTriggerJets; ijet++)
     {
       pygeh->TriggerJet(ijet, tmpjet);
       jet = new TParticle(94, 21, -1, -1, -1, -1, tmpjet[0],tmpjet[1],tmpjet[2],tmpjet[3], 0,0,0,0);
+      
+      if(fDebug > 1) 
+        printf("AliCaloTrackReader::ComparePtHardAndJetPt() - jet %d; pycell jet pT %f\n",ijet, jet->Pt());
+      
       //Compare jet pT and pt Hard
-      //if(fDebug > 1) printf("AliMCAnalysisUtils:: %d pycell jet pT %f\n",ijet, jet->Pt());
       if(jet->Pt() > fPtHardAndJetPtFactor * ptHard)
       {
-        printf("AliMCAnalysisUtils::PythiaEventHeader: Njets: %d, pT Hard %2.2f, pycell jet pT %2.2f, rejection factor %1.1f\n",
-               nTriggerJets, ptHard, jet->Pt(), fPtHardAndJetPtFactor);
+        printf("AliCaloTrackReader::ComparePtHardAndJetPt() - Reject jet event with : pT Hard %2.2f, pycell jet pT %2.2f, rejection factor %1.1f\n",
+                ptHard, jet->Pt(), fPtHardAndJetPtFactor);
         return kFALSE;
       }
     }
+    
     if(jet) delete jet; 
   }
   
@@ -241,9 +248,20 @@ AliGenEventHeader* AliCaloTrackReader::GetGenEventHeader() const
     return fMC->GenEventHeader();
   }
   else
-  {
-    printf("AliCaloTrackReader::GenEventHeader is not available\n"); 
-    return 0x0 ;
+  {    
+    if(GetAODMCHeader())
+    {
+      //printf("AliCaloTrackReader::GetGenEventHeader() - N headers %d\n",GetAODMCHeader()->GetNCocktailHeaders());
+      if( GetAODMCHeader()->GetNCocktailHeaders() > 0)
+        return GetAODMCHeader()->GetCocktailHeader(0) ;
+      else 
+        return 0x0;
+    }
+    else 
+    {
+      return 0;
+      printf("AliCaloTrackReader::GetGenEventHeader() - MC header not available!n");
+    }
   }
 }
 
@@ -274,8 +292,8 @@ TClonesArray* AliCaloTrackReader::GetAODMCParticles(Int_t input) const
   return rv ; 
 }
 
-//___________________________________________________________________
-AliAODMCHeader* AliCaloTrackReader::GetAODMCHeader(Int_t input) const 
+//________________________________________________________
+AliAODMCHeader* AliCaloTrackReader::GetAODMCHeader() const 
 {
   //Return MC header in AOD. Do it for the corresponding input event.
   
@@ -283,15 +301,8 @@ AliAODMCHeader* AliCaloTrackReader::GetAODMCHeader(Int_t input) const
   
   if(fDataType == kAOD)
   {
-    //Normal input AOD
-    if(input == 0) 
-    {
-      mch = (AliAODMCHeader*)((AliAODEvent*)fInputEvent)->FindListObject("mcheader");
-    }
-    else 
-    {
-      printf("AliCaloTrackReader::GetAODMCHeader() - wrong AOD input index, %d\n",input);
-    }
+    AliAODEvent * aod = dynamic_cast<AliAODEvent*> (fInputEvent);
+    if(aod) mch = dynamic_cast<AliAODMCHeader*>(aod->FindListObject("mcHeader"));
   }
   else 
   {
@@ -526,7 +537,7 @@ Bool_t AliCaloTrackReader::FillInputEvent(const Int_t iEntry,
   }
   
   //In case of analysis of events with jets, skip those with jet pt > 5 pt hard        
-  if(fComparePtHardAndJetPt && GetStack()) 
+  if(fComparePtHardAndJetPt) 
   {
     if(!ComparePtHardAndJetPt()) return kFALSE ;
   }

diff --git a/PWG/CaloTrackCorrBase/AliCaloTrackReader.h b/PWG/CaloTrackCorrBase/AliCaloTrackReader.h
index 5eab71e4e8375ed3cfc692d61331705e3cd91911..fa9a600cdbeecfbe250a4dbe2beca4d791a548e0 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliCaloTrackReader.h
+++ b/PWG/CaloTrackCorrBase/AliCaloTrackReader.h
@@ -346,7 +346,7 @@ public:
   
   //Filtered kinematics in AOD 
   virtual TClonesArray*     GetAODMCParticles(Int_t input = 0) const ;
-  virtual AliAODMCHeader*   GetAODMCHeader(Int_t input = 0)    const ;
+  virtual AliAODMCHeader*   GetAODMCHeader()         const ;
        
   virtual AliVEvent*        GetInputEvent()          const { return fInputEvent            ; }
   virtual AliVEvent*        GetOriginalInputEvent()  const { return 0x0                    ; }