Histos for DQM shifter further reduced + changes in checker

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

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index 259230c662071344d0f0da14d6a4eb084e123d35..664acd40df27dbbe84ac884cb7a38ad6dcedc863 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"
@@ -54,7 +55,9 @@ AliAnalysisTaskJets::AliAnalysisTaskJets():
   fAODExtension(0x0),
   fListOfHistos(0x0),
   fChain(0x0),
-  fOpt(0)
+  fOpt(0),
+  fReadAODFromOutput(0),
+  fFilterPt(0.)
 {
   // Default constructor
 }
@@ -70,7 +73,8 @@ AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name):
   fListOfHistos(0x0),
   fChain(0x0),
   fOpt(0),
-  fReadAODFromOutput(0)
+  fReadAODFromOutput(0),
+  fFilterPt(0.)
 {
   // Default constructor
   DefineOutput(1, TList::Class());
@@ -87,7 +91,8 @@ AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name, TChain* chain):
   fListOfHistos(0x0),
   fChain(chain),
   fOpt(0),
-  fReadAODFromOutput(0)
+  fReadAODFromOutput(0),
+  fFilterPt(0.)
 {
   // Default constructor
   DefineOutput(1, TList::Class());
@@ -100,9 +105,6 @@ void AliAnalysisTaskJets::UserCreateOutputObjects()
   //
   if (fDebug > 1) printf("AnalysisTaskJets::CreateOutPutData() \n");
 
-  // we already have a non standard output, need not to book a new file... 
-  if (!IsStandardAOD())fNonStdFile  = "";
-
   if(fNonStdBranch.Length()==0)
     {
       //  Connec default AOD to jet finder
@@ -124,7 +126,7 @@ 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()))){
+      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());
@@ -135,32 +137,40 @@ void AliAnalysisTaskJets::UserCreateOutputObjects()
        // 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
-  OpenFile(1);
   fListOfHistos = new TList();
   fHistos       = new AliJetHistos();
   fHistos->AddHistosToList(fListOfHistos);
@@ -178,6 +188,10 @@ 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);
 }
@@ -199,9 +213,6 @@ void AliAnalysisTaskJets::Init()
   // Initialise Jet Analysis
   if(fOpt == 0) fJetFinder->Init();
   else fJetFinder->InitTask(fChain); // V2
-  
-  // Write header information to local file
-  fJetFinder->WriteHeaders();
 }
 
 
@@ -212,7 +223,10 @@ 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();
@@ -220,12 +234,12 @@ void AliAnalysisTaskJets::UserExec(Option_t */*option*/)
     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(jarray)jarray->Delete();    // this is our responsibility, clear before filling again
+    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())));
-    evBkg->Reset();
+    if(evBkg)evBkg->Reset();
   }
 
   if (dynamic_cast<AliAODEvent*>(InputEvent()) !=  0 && !fReadAODFromOutput) {
@@ -242,7 +256,18 @@ void AliAnalysisTaskJets::UserExec(Option_t */*option*/)
   else fJetFinder->ProcessEvent2();    // V2
  
   // Fill control histos
-  fHistos->FillHistos(jarray);
+  if(jarray)fHistos->FillHistos(jarray);
+
+
+  if(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);