Get genHeader from MCEvent instead of AliRunLoader -- removes dependency on libSTEER

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

diff --git a/PWGJE/AliAnalysisTaskJetCorePP.cxx b/PWGJE/AliAnalysisTaskJetCorePP.cxx
index 4d23c729ac785ecdb07d872142ec98ddbdcdf924..c57c389c4febe3e594729518496b4d9bf54268e2 100644 (file)
--- a/PWGJE/AliAnalysisTaskJetCorePP.cxx
+++ b/PWGJE/AliAnalysisTaskJetCorePP.cxx
@@ -330,7 +330,7 @@ fDoubleBinning(kFALSE)
    TString dummy(name);
    if(dummy.Contains("KINE")){
       DefineInput(1, TClonesArray::Class());
-      //XXXX//DefineInput(2, TClonesArray::Class());
+      DefineInput(2, TClonesArray::Class());
    }
 }
 
@@ -493,49 +493,52 @@ Bool_t AliAnalysisTaskJetCorePP::Notify()
    //and number of trials from pyxsec.root
    //inspired by AliAnalysisTaskJetSpectrum2::Notify()
    if(!(fIsChargedMC || fIsKine)) return kFALSE; 
+   Float_t xsection = 0;
+   Float_t trials  = 1;
+   fAvgTrials = 1;
 
-   fESD = dynamic_cast<AliESDEvent*>(InputEvent());
-   if(!fESD){
-      if(fDebug>1) AliError("ESD not available");
-      fAODIn = dynamic_cast<AliAODEvent*>(InputEvent());
-   } 
+   if(fIsChargedMC){ 
+      fESD = dynamic_cast<AliESDEvent*>(InputEvent());
+      if(!fESD){
+         if(fDebug>1) AliError("ESD not available");
+         fAODIn = dynamic_cast<AliAODEvent*>(InputEvent());
+      } 
  
-   fAODOut = dynamic_cast<AliAODEvent*>(AODEvent());
+      fAODOut = dynamic_cast<AliAODEvent*>(AODEvent());
 
 
-   if(fNonStdFile.Length()!=0){
-      // case that we have an AOD extension we can fetch the jets from the extended output
-      AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
-      fAODExtension = aodH ? aodH->GetExtension(fNonStdFile.Data()) : 0;
-      if(!fAODExtension){
-         if(fDebug>1) Printf("AODExtension found for %s",fNonStdFile.Data());
-      } 
-   }
+      if(fNonStdFile.Length()!=0){
+         // case that we have an AOD extension we can fetch the jets from the extended output
+         AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
+         fAODExtension = aodH ? aodH->GetExtension(fNonStdFile.Data()) : 0;
+         if(!fAODExtension){
+            if(fDebug>1) Printf("AODExtension found for %s",fNonStdFile.Data());
+         } 
+      }
  
-   TTree *tree = AliAnalysisManager::GetAnalysisManager()->GetTree();
-   Float_t xsection = 0;
-   Float_t ftrials  = 1;
+      TTree *tree = AliAnalysisManager::GetAnalysisManager()->GetTree();
 
-   fAvgTrials = 1;
-   if(tree){
-      TFile *curfile = tree->GetCurrentFile();
-      if(!curfile) {
-         Error("Notify","No current file");
-         return kFALSE;
-      }
-      if(!fh1Xsec || !fh1Trials){
-         Printf("%s%d No Histogram fh1Xsec",(char*)__FILE__,__LINE__);
-         return kFALSE;
-      }
-      AliAnalysisHelperJetTasks::PythiaInfoFromFile(curfile->GetName(),xsection,ftrials);
-      fh1Xsec->Fill("<#sigma>",xsection);
-      // construct a poor man average trials
-      Float_t nEntries = (Float_t)tree->GetTree()->GetEntries();
-      if(ftrials>=nEntries && nEntries>0.) fAvgTrials = ftrials/nEntries;
-      fh1Trials->Fill("#sum{ntrials}",ftrials);
-   }  
+      if(tree){
+         TFile *curfile = tree->GetCurrentFile();
+         if(!curfile) {
+            Error("Notify","No current file");
+            return kFALSE;
+         }
+         if(!fh1Xsec || !fh1Trials){
+            Printf("%s%d No Histogram fh1Xsec",(char*)__FILE__,__LINE__);
+            return kFALSE;
+         }
+         AliAnalysisHelperJetTasks::PythiaInfoFromFile(curfile->GetName(),xsection,trials);
+         fh1Xsec->Fill("<#sigma>",xsection);
+         // construct a poor man average trials
+         Float_t nEntries = (Float_t)tree->GetTree()->GetEntries();
+         if(trials>=nEntries && nEntries>0.) fAvgTrials = trials/nEntries;
+         fh1Trials->Fill("#sum{ntrials}",trials);
+      }  
+
+      if(fDebug)Printf("Reading File %s",fInputHandler->GetTree()->GetCurrentFile()->GetName());
+   }
 
-   if(fDebug)Printf("Reading File %s",fInputHandler->GetTree()->GetCurrentFile()->GetName());
 
    return kTRUE;
 }
@@ -571,10 +574,6 @@ void AliAnalysisTaskJetCorePP::UserCreateOutputObjects()
 
    fRandom = new TRandom3(0);
 
-   //if(fIsKine){ //?????????????????????????????????????????
-   //}
-
-
    if(fIsChargedMC || fIsKine){   //full MC or pure kine
       fListJetsGen   = new TList(); //generator level charged antikt jets
       fListJetsBgGen = new TList(); //generator level jets to be removed from bg 
@@ -906,6 +905,23 @@ void AliAnalysisTaskJetCorePP::UserCreateOutputObjects()
 
 void AliAnalysisTaskJetCorePP::UserExec(Option_t *)
 {
+   //User Exec
+   
+   if(fIsKine){ //Fill Xsection and number of trials
+      Float_t xsection = 0;
+      Float_t trials  = 0;
+ 
+      AliMCEvent *mcEvent = MCEvent();
+      AliGenPythiaEventHeader *genPH = dynamic_cast<AliGenPythiaEventHeader*>(mcEvent->GenEventHeader());
+      if(genPH){
+         xsection = genPH->GetXsection();
+         trials  = genPH->Trials();
+      }
+      fh1Xsec->Fill("<#sigma>",xsection);
+      fh1Trials->Fill("#sum{ntrials}",trials);
+   }//KF//
+
+
    //Event loop
    Double_t eventW  = 1.0;
    Double_t ptHard  = 0.0;
@@ -932,21 +948,21 @@ void AliAnalysisTaskJetCorePP::UserExec(Option_t *)
          return;
       }
    }else{  //Kine
-      //XXXX// if(!strlen(fJetBranchNameBgKine.Data())){
-      //XXXX//   AliError("Name of jet bg branch for kine not set.");
-      //XXXX//   return;
-      //XXXX// }
+       if(!strlen(fJetBranchNameBgKine.Data())){
+         AliError("Name of jet bg branch for kine not set.");
+         return;
+       }
 
       Init(); 
       if(fMcHandler){
          fMcEvent = fMcHandler->MCEvent(); 
       }else{
-         if(fDebug > 1) printf("AnalysisTaskJetClusterKine::Handler() fMcHandler=NULL\n");
+         if(fDebug > 1) printf("AliAnalysisTaskJetCorePP::Exec() fMcHandler=NULL\n");
          PostData(1, fOutputList);
          return;
       } 
       if(!fMcEvent){
-         if(fDebug > 1) printf("AnalysisTaskJetClusterKine::Exec()   fMcEvent=NULL \n");
+         if(fDebug > 1) printf("AliAnalysisTaskJetCorePP::Exec() fMcEvent=NULL \n");
          PostData(1, fOutputList);
          return;
       }
@@ -1121,7 +1137,7 @@ void AliAnalysisTaskJetCorePP::UserExec(Option_t *)
 
          //================= generated charged antikt jets ================
          ReadTClonesArray(fJetBranchNameKine.Data(),   fListJetsGen); 
-         //XXXX//ReadTClonesArray(fJetBranchNameBgKine.Data(), fListJetsBgGen); 
+         ReadTClonesArray(fJetBranchNameBgKine.Data(), fListJetsBgGen); 
       }else{  
          //================= generated charged antikt jets ================
          ReadTClonesArray(fJetBranchNameChargMC.Data(),   fListJetsGen); 
@@ -1228,7 +1244,6 @@ void AliAnalysisTaskJetCorePP::UserExec(Option_t *)
       EstimateBgCone(fListJetsGen, &particleListGen, rhoConeGen);
 
       //Estimate rho from cell median minus jets
-      if(!fIsKine)  //XXXX//
       EstimateBgRhoMedian(fListJetsBgGen, &particleListGen, rhoFromCellMedianGen,1);//mc data
 
       //============  Generator trigger+jet ==================
@@ -2061,9 +2076,9 @@ void AliAnalysisTaskJetCorePP::ReadTClonesArray(TString bname, TList *list){
       if(fJetBranchNameKine.Length()>0 && bname.CompareTo(fJetBranchNameKine.Data())==0){
          array = dynamic_cast<TClonesArray*>(GetInputData(1)); //connect exchange container slot 1
       }
-      //XXXX// if(fJetBranchNameBgKine.Length()>0 && bname.CompareTo(fJetBranchNameBgKine.Data())==0){
-      //XXXX//   array = dynamic_cast<TClonesArray*>(GetInputData(2)); //connect exchange container slot 2
-      //XXXX// }
+      if(fJetBranchNameBgKine.Length()>0 && bname.CompareTo(fJetBranchNameBgKine.Data())==0){
+        array = dynamic_cast<TClonesArray*>(GetInputData(2)); //connect exchange container slot 2
+      }
    }else{ //take input from AOD
       if(fAODOut&&!array){
          array = dynamic_cast<TClonesArray*>(fAODOut->FindListObject(bname.Data()));