Memeory leak corrected. (D. Perrino)

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

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index fdb43e53cae364d87b53c1b2829a856807f7ccb9..20e7c098caf78fde9b89b4752b5323de1ec1e7b9 100644 (file)
--- a/JETAN/AliAnalysisTaskJets.cxx
+++ b/JETAN/AliAnalysisTaskJets.cxx
@@ -12,20 +12,28 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
+
+/* $Id$ */
  
 #include <TROOT.h>
 #include <TSystem.h>
 #include <TInterpreter.h>
 #include <TChain.h>
 #include <TFile.h>
-#include <TH1.h>
+#include <TList.h>
 
 #include "AliAnalysisTaskJets.h"
 #include "AliAnalysisManager.h"
 #include "AliJetFinder.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"
 
 
 ClassImp(AliAnalysisTaskJets)
@@ -35,11 +43,12 @@ ClassImp(AliAnalysisTaskJets)
 AliAnalysisTaskJets::AliAnalysisTaskJets():
     fDebug(0),
     fJetFinder(0x0),
-    fChain(0x0),
+    fTree(0x0),
     fESD(0x0),
     fAOD(0x0),
     fTreeA(0x0),
-    fHisto(0x0)
+    fHistos(0x0),
+    fListOfHistos(0x0)
 {
   // Default constructor
 }
@@ -48,16 +57,17 @@ AliAnalysisTaskJets::AliAnalysisTaskJets(const char* name):
     AliAnalysisTask(name, "AnalysisTaskJets"),
     fDebug(0),
     fJetFinder(0x0),
-    fChain(0x0),
+    fTree(0x0),
     fESD(0x0),
     fAOD(0x0),
     fTreeA(0x0),
-    fHisto(0x0)
+    fHistos(0x0),
+    fListOfHistos(0x0)
 {
   // Default constructor
     DefineInput (0, TChain::Class());
     DefineOutput(0, TTree::Class());
-    DefineOutput(1, TH1F::Class());
+    DefineOutput(1, TList::Class());
 }
 
 void AliAnalysisTaskJets::CreateOutputObjects()
@@ -66,14 +76,17 @@ void AliAnalysisTaskJets::CreateOutputObjects()
 //
 //  Default AOD
     if (fDebug > 1) printf("AnalysisTaskJets::CreateOutPutData() \n");
-    AliAODHandler* handler = (AliAODHandler*) ((AliAnalysisManager::GetAnalysisManager())->GetEventHandler());
+    AliAODHandler* handler = (AliAODHandler*) ((AliAnalysisManager::GetAnalysisManager())->GetOutputEventHandler());
+    
     fAOD   = handler->GetAOD();
     fTreeA = handler->GetTree();
     fJetFinder->ConnectAOD(fAOD);
 //
-//  Histogram
+//  Histograms
     OpenFile(1);
-    fHisto = new TH1F("fHisto", "Jet Et", 100, 0., 100.);
+    fListOfHistos = new TList();
+    fHistos       = new AliJetHistos();
+    fHistos->AddHistosToList(fListOfHistos);
 }
 
 void AliAnalysisTaskJets::Init()
@@ -94,21 +107,39 @@ 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);
-    fJetFinder->ConnectTree(fChain, fESD);
+    AliESDInputHandler* esdH = (AliESDInputHandler*) ((AliAnalysisManager::GetAnalysisManager())->GetInputEventHandler());
+    fESD = esdH->GetEvent();
+    fTree = esdH->GetTree();
+    
+    
+
+    AliMCEventHandler*    mcTruth = (AliMCEventHandler*) 
+       ((AliAnalysisManager::GetAnalysisManager())->GetMCtruthEventHandler());
+    
+    fJetFinder->GetReader()->SetInputEvent(fESD, fAOD, mcTruth);
 }
 
 void AliAnalysisTaskJets::Exec(Option_t */*option*/)
 {
 // Execute analysis for current event
 //
-    Long64_t ientry = fChain->GetReadEntry();
+    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, fHisto);
+    PostData(1, fListOfHistos);
 }
 
 void AliAnalysisTaskJets::Terminate(Option_t */*option*/)
@@ -116,6 +147,6 @@ void AliAnalysisTaskJets::Terminate(Option_t */*option*/)
 // Terminate analysis
 //
     if (fDebug > 1) printf("AnalysisJets: Terminate() \n");
-    // if (fJetFinder) fJetFinder->FinishRun();
+//    if (fJetFinder) fJetFinder->FinishRun();
 }