Fix to Jan Fiete's bug report

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

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index 8aee78126262c610b5bd05400c2d880685fc73ec..6cac62e9e9f5914f49a593a7cbea639c904eebee 100644 (file)
--- a/JETAN/AliAnalysisTaskJets.cxx
+++ b/JETAN/AliAnalysisTaskJets.cxx
@@ -25,11 +25,15 @@
 #include "AliAnalysisTaskJets.h"
 #include "AliAnalysisManager.h"
 #include "AliJetFinder.h"
+#include "AliJetHeader.h"
 #include "AliJetHistos.h"
 #include "AliESDEvent.h"
+#include "AliESD.h"
 #include "AliAODEvent.h"
 #include "AliAODHandler.h"
 #include "AliMCEventHandler.h"
+#include "AliESDInputHandler.h"
+#include "AliMCEvent.h"
 #include "AliStack.h"
 
 
@@ -38,52 +42,68 @@ ClassImp(AliAnalysisTaskJets)
 ////////////////////////////////////////////////////////////////////////
 
 AliAnalysisTaskJets::AliAnalysisTaskJets():
-    fDebug(0),
-    fJetFinder(0x0),
-    fChain(0x0),
-    fESD(0x0),
-    fAOD(0x0),
-    fTreeA(0x0),
-    fHistos(0x0),
-    fListOfHistos(0x0)
+    AliAnalysisTaskSE(),
+  fConfigFile("ConfigJetAnalysis.C"),  
+  fNonStdBranch(""),  
+  fJetFinder(0x0),
+  fHistos(0x0),
+  fListOfHistos(0x0)
 {
   // Default constructor
 }
 
 AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name):
-    AliAnalysisTask(name, "AnalysisTaskJets"),
-    fDebug(0),
+    AliAnalysisTaskSE(name),
+    fConfigFile("ConfigJetAnalysis.C"),  
+    fNonStdBranch(""),  
     fJetFinder(0x0),
-    fChain(0x0),
-    fESD(0x0),
-    fAOD(0x0),
-    fTreeA(0x0),
     fHistos(0x0),
     fListOfHistos(0x0)
 {
   // Default constructor
-    DefineInput (0, TChain::Class());
-    DefineOutput(0, TTree::Class());
     DefineOutput(1, TList::Class());
 }
 
-void AliAnalysisTaskJets::CreateOutputObjects()
+void AliAnalysisTaskJets::UserCreateOutputObjects()
 {
 // 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
+
+    if(fNonStdBranch.Length()==0){
+      //  Connec default AOD to jet finder
+      fJetFinder->ConnectAOD(AODEvent());
+    }
+    else{
+      // Create a new branch for jets...
+      // how is this is 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 JetFinderInforamtion 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::Init()
@@ -92,7 +112,7 @@ void AliAnalysisTaskJets::Init()
     if (fDebug > 1) printf("AnalysisTaskJets::Init() \n");
 
     // Call configuration file
-    gROOT->LoadMacro("ConfigJetAnalysis.C");
+    gROOT->LoadMacro(fConfigFile);
     fJetFinder = (AliJetFinder*) gInterpreter->ProcessLine("ConfigJetAnalysis()");
     // Initialise Jet Analysis
     fJetFinder->Init();
@@ -100,46 +120,32 @@ void AliAnalysisTaskJets::Init()
     fJetFinder->WriteHeaders();
 }
 
-void AliAnalysisTaskJets::ConnectInputData(Option_t */*option*/)
-{
-// Connect the input data
-    if (fDebug > 1) printf("AnalysisTaskJets::ConnectInputData() \n");
-    fChain = (TChain*)GetInputData(0);
-    fESD = new AliESDEvent();
-    fESD->ReadFromTree(fChain);
+    
 
-    AliMCEventHandler*    mcTruth = (AliMCEventHandler*) 
-       ((AliAnalysisManager::GetAnalysisManager())->GetMCtruthEventHandler());
 
-    fJetFinder->GetReader()->SetInputEvent(fESD, fAOD, mcTruth);
-}
 
-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->Stack();
-       printf("AliAnalysisTaskJets: Number of tracks on stack %5d\n", stack->GetNtrack());
-    }
-    
-    AliESD* old = fESD->GetAliESDOld();
-    if (old) {
-       fESD->CopyFromOldESD();
-    }
-    
-    Long64_t ientry = fChain->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());
+  fJetFinder->ProcessEvent();
+
+  fHistos->FillHistos(jarray);
+  // Post the data
+  PostData(1, fListOfHistos);
 }
 
 void AliAnalysisTaskJets::Terminate(Option_t */*option*/)
@@ -147,6 +153,6 @@ void AliAnalysisTaskJets::Terminate(Option_t */*option*/)
 // Terminate analysis
 //
     if (fDebug > 1) printf("AnalysisJets: Terminate() \n");
-    // if (fJetFinder) fJetFinder->FinishRun();
+//    if (fJetFinder) fJetFinder->FinishRun();
 }