Adding rho's depenence on trigger track (M. Verweij)

[u/mrichter/AliRoot.git] / JETAN / AliAnalysisTaskJets.cxx

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index f985d10a84b7bd09ce97e00883920d523cd74f81..d92731c9b3116cc9dc39ccdada52301bededf48b 100644 (file)
--- a/JETAN/AliAnalysisTaskJets.cxx
+++ b/JETAN/AliAnalysisTaskJets.cxx
@@ -21,6 +21,7 @@
 #include <TChain.h>
 #include <TFile.h>
 #include <TList.h>
+#include <TH1.h>
 
 #include "AliAnalysisTaskJets.h"
 #include "AliAnalysisManager.h"
@@ -34,6 +35,7 @@
 #include "AliAODEvent.h"
 #include "AliAODJetEventBackground.h"
 #include "AliAODHandler.h"
+#include "AliAODExtension.h"
 #include "AliMCEventHandler.h"
 #include "AliESDInputHandler.h"
 #include "AliMCEvent.h"
@@ -55,7 +57,9 @@ AliAnalysisTaskJets::AliAnalysisTaskJets():
   fListOfHistos(0x0),
   fChain(0x0),
   fOpt(0),
-  fReadAODFromOutput(0)
+  fReadAODFromOutput(0),
+  fUseAODBackground(kFALSE),
+  fFilterPt(0.)
 {
   // Default constructor
 }
@@ -71,7 +75,9 @@ AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name):
   fListOfHistos(0x0),
   fChain(0x0),
   fOpt(0),
-  fReadAODFromOutput(0)
+  fReadAODFromOutput(0),
+  fUseAODBackground(kFALSE),
+  fFilterPt(0.)
 {
   // Default constructor
   DefineOutput(1, TList::Class());
@@ -88,7 +94,9 @@ AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name, TChain* chain):
   fListOfHistos(0x0),
   fChain(chain),
   fOpt(0),
-  fReadAODFromOutput(0)
+  fReadAODFromOutput(0),
+  fUseAODBackground(kFALSE),
+  fFilterPt(0.)
 {
   // Default constructor
   DefineOutput(1, TList::Class());
@@ -101,14 +109,19 @@ void AliAnalysisTaskJets::UserCreateOutputObjects()
   //
   if (fDebug > 1) printf("AnalysisTaskJets::CreateOutPutData() \n");
 
+  AliJetHeader *fH = fJetFinder->GetHeader();
+
   if(fNonStdBranch.Length()==0)
     {
       //  Connec default AOD to jet finder
       // create a new branch for the background
-      if(!AODEvent()->FindListObject(AliAODJetEventBackground::StdBranchName())){
-       AliAODJetEventBackground* evBkg = new AliAODJetEventBackground();
-       evBkg->SetName(AliAODJetEventBackground::StdBranchName());
-       AddAODBranch("AliAODJetEventBackground",&evBkg);
+
+      if(fUseAODBackground){
+       if(!AODEvent()->FindListObject(AliAODJetEventBackground::StdBranchName())){
+         AliAODJetEventBackground* evBkg = new AliAODJetEventBackground();
+         evBkg->SetName(AliAODJetEventBackground::StdBranchName());
+         AddAODBranch("AliAODJetEventBackground",&evBkg);
+       }
       }
       fJetFinder->ConnectAOD(AODEvent());
     }
@@ -122,48 +135,58 @@ void AliAnalysisTaskJets::UserCreateOutputObjects()
       TClonesArray *tca = new TClonesArray("AliAODJet", 0);
       tca->SetName(fNonStdBranch.Data());
       AddAODBranch("TClonesArray",&tca,fNonStdFile.Data());
-      if(!AODEvent()->FindListObject(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data()))){
-       AliAODJetEventBackground* evBkg = new AliAODJetEventBackground();
-       evBkg->SetName(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data()));
-       AddAODBranch("AliAODJetEventBackground",&evBkg,fNonStdFile.Data());
+      if(fUseAODBackground){
+       if(!AODEvent() || !AODEvent()->FindListObject(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data()))){
+         AliAODJetEventBackground* evBkg = new AliAODJetEventBackground();
+         evBkg->SetName(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data()));
+         AddAODBranch("AliAODJetEventBackground",&evBkg,fNonStdFile.Data());
+       }
       }
-
       if(fNonStdFile.Length()!=0){
        // 
        // case that we have an AOD extension we need to fetch the jets from the extended output
        // we identifay the extension aod event by looking for the branchname
        AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
-       TObjArray* extArray = aodH->GetExtensions();
-       if (extArray) {
-         TIter next(extArray);
-         while ((fAODExtension=(AliAODExtension*)next())){
-           TObject *obj = fAODExtension->GetAOD()->FindListObject(fNonStdBranch.Data());
-           if(fDebug>10){
-             Printf("%s:%d Dumping..",(char*)__FILE__,__LINE__);
-             fAODExtension->GetAOD()->Dump();
-           }
-           if(obj){
+       fAODExtension = 0;
+       if(aodH){
+         TObjArray* extArray = aodH->GetExtensions();
+         if (extArray) {
+           TIter next(extArray);
+           while ((fAODExtension=(AliAODExtension*)next())){
+             TObject *obj = fAODExtension->GetAOD()->FindListObject(fNonStdBranch.Data());
+             if(fDebug>10){
+               Printf("%s:%d Dumping..",(char*)__FILE__,__LINE__);
+               fAODExtension->GetAOD()->Dump();
+             }
+             if(obj){
              if(fDebug>1)Printf("AODExtension found for %s",fNonStdBranch.Data());
              break;
+             }
+             fAODExtension = 0;
            }
-           fAODExtension = 0;
          }
        }
        if(fAODExtension)fJetFinder->ConnectAODNonStd(fAODExtension->GetAOD(), fNonStdBranch.Data()); 
       }
       else{
+       if (fDebug > 1) printf("Connecting Non Std Branch AOD %p %s \n",AODEvent(),fNonStdBranch.Data());
        fJetFinder->ConnectAODNonStd(AODEvent(), fNonStdBranch.Data()); 
       }
     }
 
+  // do not add the histograms in the directory
+  // all handled by the list
+  Bool_t oldStatus = TH1::AddDirectoryStatus();
+  TH1::AddDirectory(kFALSE);
+
 
   // Histograms
   fListOfHistos = new TList();
+  fListOfHistos->SetOwner();
   fHistos       = new AliJetHistos();
   fHistos->AddHistosToList(fListOfHistos);
   
   // Add the JetFinderInformation to the Outputlist
-  AliJetHeader *fH = fJetFinder->GetHeader();
   
   // Compose a characteristic output name
   // with the name of the output branch
@@ -175,8 +198,16 @@ void AliAnalysisTaskJets::UserCreateOutputObjects()
       fH->SetName(Form("AliJetHeader_%s",fNonStdBranch.Data()));
     }
   }
+
+  TH1::AddDirectory(oldStatus);
+  
+  
   if(!fAODExtension)OutputTree()->GetUserInfo()->Add(fH);
   else fAODExtension->GetTree()->GetUserInfo()->Add(fH);
+
+  // post
+  PostData(1, fListOfHistos);
+
 }
 
 //----------------------------------------------------------------
@@ -193,6 +224,12 @@ void AliAnalysisTaskJets::Init()
   AliJetReaderHeader *header = (AliJetReaderHeader*)fJetFinder->GetReader()->GetReaderHeader();
   fOpt = header->GetDetector();
 
+// AODB path for Jetan Analysis... if not alread defined, use the standard one
+if ((!(((AliJetReader*) fJetFinder->GetReader())->GetJetanOADBPath()).Length())) {
+((AliJetReader*) fJetFinder->GetReader())->SetJetanOADBPath(AliAnalysisManager::GetOADBPath());
+}
+else Info( "Init"," OADBPath for Jetan was already defined (config file?) as %s",(char*)((fJetFinder->GetReader()->GetJetanOADBPath()).Data()));
+       
   // Initialise Jet Analysis
   if(fOpt == 0) fJetFinder->Init();
   else fJetFinder->InitTask(fChain); // V2
@@ -206,20 +243,27 @@ void AliAnalysisTaskJets::UserExec(Option_t */*option*/)
   //
   // Fill control histos
   TClonesArray* jarray = 0;
-  AliAODJetEventBackground*  evBkg;
+  AliAODJetEventBackground*  evBkg = 0;
+
+  // only need this once
+  static AliAODHandler *aodH = dynamic_cast<AliAODHandler*>(AliAnalysisManager::GetAnalysisManager()->GetOutputEventHandler());
 
   if(fNonStdBranch.Length()==0) {
     jarray = AODEvent()->GetJets();
-    evBkg = (AliAODJetEventBackground*)(AODEvent()->FindListObject(AliAODJetEventBackground::StdBranchName()));
-    evBkg->Reset();
+    if(fUseAODBackground){
+      evBkg = (AliAODJetEventBackground*)(AODEvent()->FindListObject(AliAODJetEventBackground::StdBranchName()));
+      evBkg->Reset();
+    }
   }
   else {
-    jarray = (TClonesArray*)(AODEvent()->FindListObject(fNonStdBranch.Data()));
+    if(AODEvent())jarray = (TClonesArray*)(AODEvent()->FindListObject(fNonStdBranch.Data()));
     if(!jarray)jarray = (TClonesArray*)(fAODExtension->GetAOD()->FindListObject(fNonStdBranch.Data()));
-    jarray->Delete();    // this is our responsibility, clear before filling again
-    evBkg = (AliAODJetEventBackground*)(AODEvent()->FindListObject(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data())));
-    if(!evBkg)  evBkg = (AliAODJetEventBackground*)(fAODExtension->GetAOD()->FindListObject(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data())));
-    evBkg->Reset();
+    if(jarray)jarray->Delete();    // this is our responsibility, clear before filling again
+    if(fUseAODBackground){
+      if(AODEvent())evBkg = (AliAODJetEventBackground*)(AODEvent()->FindListObject(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data())));
+      if(!evBkg)  evBkg = (AliAODJetEventBackground*)(fAODExtension->GetAOD()->FindListObject(Form("%s_%s",AliAODJetEventBackground::StdBranchName(),fNonStdBranch.Data())));
+      if(evBkg)evBkg->Reset();
+    }
   }
 
   if (dynamic_cast<AliAODEvent*>(InputEvent()) !=  0 && !fReadAODFromOutput) {
@@ -236,7 +280,18 @@ void AliAnalysisTaskJets::UserExec(Option_t */*option*/)
   else fJetFinder->ProcessEvent2();    // V2
  
   // Fill control histos
-  fHistos->FillHistos(jarray);
+  if(jarray)fHistos->FillHistos(jarray);
+
+
+  if(jarray&&aodH&&fFilterPt>0){
+    if(jarray->GetEntries()>0){
+      AliAODJet *jet = (AliAODJet*)jarray->At(0);
+      if(jet->Pt()>fFilterPt){
+       //      aodH->EnableFillAODforEvent();
+       aodH->SetFillAOD(kTRUE);
+      }
+    }
+  }
 
   // Post the data
   PostData(1, fListOfHistos);