Add only once "fdcodeH" to "fListOfHistos" as advised by A.Gheata and implemented...

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

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index 20e7c098caf78fde9b89b4752b5323de1ec1e7b9..b34436e68f7f46df7297a62d8d2fb5d1b1e81da0 100644 (file)
--- a/JETAN/AliAnalysisTaskJets.cxx
+++ b/JETAN/AliAnalysisTaskJets.cxx
@@ -14,7 +14,7 @@
  **************************************************************************/
 
 /* $Id$ */
- 
+#include <Riostream.h> 
 #include <TROOT.h>
 #include <TSystem.h>
 #include <TInterpreter.h>
@@ -25,6 +25,9 @@
 #include "AliAnalysisTaskJets.h"
 #include "AliAnalysisManager.h"
 #include "AliJetFinder.h"
+#include "AliJetHeader.h"
+#include "AliJetReader.h"
+#include "AliJetReaderHeader.h"
 #include "AliJetHistos.h"
 #include "AliESDEvent.h"
 #include "AliESD.h"
@@ -41,107 +44,143 @@ ClassImp(AliAnalysisTaskJets)
 ////////////////////////////////////////////////////////////////////////
 
 AliAnalysisTaskJets::AliAnalysisTaskJets():
-    fDebug(0),
-    fJetFinder(0x0),
-    fTree(0x0),
-    fESD(0x0),
-    fAOD(0x0),
-    fTreeA(0x0),
-    fHistos(0x0),
-    fListOfHistos(0x0)
+  AliAnalysisTaskSE(),
+  fConfigFile("ConfigJetAnalysis.C"),
+  fNonStdBranch(""), 
+  fJetFinder(0x0),
+  fHistos(0x0),
+  fListOfHistos(0x0),
+  fChain(0x0),
+  fOpt(0)
 {
   // Default constructor
 }
 
 AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name):
-    AliAnalysisTask(name, "AnalysisTaskJets"),
-    fDebug(0),
-    fJetFinder(0x0),
-    fTree(0x0),
-    fESD(0x0),
-    fAOD(0x0),
-    fTreeA(0x0),
-    fHistos(0x0),
-    fListOfHistos(0x0)
+  AliAnalysisTaskSE(name),
+  fConfigFile("ConfigJetAnalysis.C"),
+  fNonStdBranch(""),
+  fJetFinder(0x0),
+  fHistos(0x0),
+  fListOfHistos(0x0),
+  fChain(0x0),
+  fOpt(0)
 {
   // Default constructor
-    DefineInput (0, TChain::Class());
-    DefineOutput(0, TTree::Class());
-    DefineOutput(1, TList::Class());
+  DefineOutput(1, TList::Class());
 }
 
-void AliAnalysisTaskJets::CreateOutputObjects()
+AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name, TChain* chain):
+  AliAnalysisTaskSE(name),
+  fConfigFile("ConfigJetAnalysis.C"),
+  fNonStdBranch(""),
+  fJetFinder(0x0),
+  fHistos(0x0),
+  fListOfHistos(0x0),
+  fChain(chain),
+  fOpt(0)
 {
-// Create the output container
-//
-//  Default AOD
-    if (fDebug > 1) printf("AnalysisTaskJets::CreateOutPutData() \n");
-    AliAODHandler* handler = (AliAODHandler*) ((AliAnalysisManager::GetAnalysisManager())->GetOutputEventHandler());
-    
-    fAOD   = handler->GetAOD();
-    fTreeA = handler->GetTree();
-    fJetFinder->ConnectAOD(fAOD);
-//
-//  Histograms
-    OpenFile(1);
-    fListOfHistos = new TList();
-    fHistos       = new AliJetHistos();
-    fHistos->AddHistosToList(fListOfHistos);
+  // Default constructor
+  DefineOutput(1, TList::Class());
 }
 
-void AliAnalysisTaskJets::Init()
+//----------------------------------------------------------------
+void AliAnalysisTaskJets::UserCreateOutputObjects()
 {
-    // Initialization
-    if (fDebug > 1) printf("AnalysisTaskJets::Init() \n");
-
-    // Call configuration file
-    gROOT->LoadMacro("ConfigJetAnalysis.C");
-    fJetFinder = (AliJetFinder*) gInterpreter->ProcessLine("ConfigJetAnalysis()");
-    // Initialise Jet Analysis
-    fJetFinder->Init();
-    // Write header information to local file
-    fJetFinder->WriteHeaders();
+  // Create the output container
+  //
+  if (fDebug > 1) printf("AnalysisTaskJets::CreateOutPutData() \n");
+  
+  if(fNonStdBranch.Length()==0)
+    {
+      //  Connec default AOD to jet finder
+      fJetFinder->ConnectAOD(AODEvent());
+    }
+  else
+    {
+      // Create a new branch for jets...
+      // how is this reset? -> cleared in the UserExec....
+      // Can this be handled by the framework?
+      TClonesArray *tca = new TClonesArray("AliAODJet", 0);
+      tca->SetName(fNonStdBranch);
+      AddAODBranch("TClonesArray",&tca);
+      fJetFinder->ConnectAODNonStd(AODEvent(), fNonStdBranch.Data()); 
+    }
+  
+  // Histograms
+  OpenFile(1);
+  fListOfHistos = new TList();
+  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
+  if(fH) {
+    if(fNonStdBranch.Length()==0) {
+      fH->SetName("AliJetHeader_jets");
+    }
+    else {
+      fH->SetName(Form("AliJetHeader_%s",fNonStdBranch.Data()));
+    }
+  }
+  OutputTree()->GetUserInfo()->Add(fH);
 }
 
-void AliAnalysisTaskJets::ConnectInputData(Option_t */*option*/)
+//----------------------------------------------------------------
+void AliAnalysisTaskJets::Init()
 {
-// Connect the input data
-    if (fDebug > 1) printf("AnalysisTaskJets::ConnectInputData() \n");
-    AliESDInputHandler* esdH = (AliESDInputHandler*) ((AliAnalysisManager::GetAnalysisManager())->GetInputEventHandler());
-    fESD = esdH->GetEvent();
-    fTree = esdH->GetTree();
-    
-    
-
-    AliMCEventHandler*    mcTruth = (AliMCEventHandler*) 
-       ((AliAnalysisManager::GetAnalysisManager())->GetMCtruthEventHandler());
-    
-    fJetFinder->GetReader()->SetInputEvent(fESD, fAOD, mcTruth);
+  // Initialization
+  if (fDebug > 1) printf("AnalysisTaskJets::Init() \n");
+  
+  // Call configuration file
+  if (fConfigFile.Length()) {
+    gROOT->LoadMacro(fConfigFile);
+    fJetFinder = (AliJetFinder*) gInterpreter->ProcessLine("ConfigJetAnalysis()");
+  }
+  AliJetReaderHeader *header = (AliJetReaderHeader*)fJetFinder->GetReader()->GetReaderHeader();
+  fOpt = header->GetDetector();
+
+  // Initialise Jet Analysis
+  if(fOpt == 0) fJetFinder->Init();
+  else fJetFinder->InitTask(fChain); // V2
+  
+  // Write header information to local file
+  fJetFinder->WriteHeaders();
 }
 
-void AliAnalysisTaskJets::Exec(Option_t */*option*/)
+//----------------------------------------------------------------
+void AliAnalysisTaskJets::UserExec(Option_t */*option*/)
 {
-// Execute analysis for current event
-//
-    AliMCEventHandler*    mctruth = (AliMCEventHandler*) 
-       ((AliAnalysisManager::GetAnalysisManager())->GetMCtruthEventHandler());
-    if (mctruth) {
-       AliStack* stack = mctruth->MCEvent()->Stack();
-       //printf("AliAnalysisTaskJets: Number of tracks on stack %5d\n", stack->GetNtrack());
-    }
-    
-    Long64_t ientry = fTree->GetReadEntry();
-    if (fDebug > 1) printf("Analysing event # %5d\n", (Int_t) ientry);
-    fJetFinder->ProcessEvent(ientry);
-
-    // Fill control histos
-    fHistos->FillHistos(fAOD->GetJets());
-    
-    // Post the data
-    PostData(0, fTreeA);
-    PostData(1, fListOfHistos);
+  // Execute analysis for current event
+  //
+  // Fill control histos
+  TClonesArray* jarray = 0;
+
+  if(fNonStdBranch.Length()==0) {
+    jarray = AODEvent()->GetJets();
+  }
+  else {
+    jarray = dynamic_cast<TClonesArray*>(AODEvent()->FindListObject(fNonStdBranch.Data()));
+    jarray->Delete();    // this is our responsibility, clear before filling again
+  }
+
+  fJetFinder->GetReader()->SetInputEvent(InputEvent(), AODEvent(), MCEvent());
+  if(fOpt==0) fJetFinder->ProcessEvent();
+  else fJetFinder->ProcessEvent2();    // V2
+ 
+  // Fill control histos
+  fHistos->FillHistos(jarray);
+
+  // Post the data
+  PostData(1, fListOfHistos);
 }
 
+
+//*************************************************************
+
 void AliAnalysisTaskJets::Terminate(Option_t */*option*/)
 {
 // Terminate analysis