From 1b307662e672a05dde9115f5395a280f26735dc6 Mon Sep 17 00:00:00 2001
From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 12 Jul 2007 08:36:56 +0000
Subject: [PATCH] Use AliESDEvent instead of AliESD.

---
 JETAN/AliAnalysisTaskJets.cxx | 19 ++++---------------
 JETAN/AliAnalysisTaskJets.h   |  4 ++--
 JETAN/AliJetESDReader.cxx     |  8 +++++---
 JETAN/AliJetESDReader.h       |  4 ++--
 JETAN/AliJetESDmcReader.cxx   |  2 +-
 JETAN/AliJetMCReader.cxx      |  2 +-
 6 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index 674cec0abca..fdb43e53cae 100644
--- a/JETAN/AliAnalysisTaskJets.cxx
+++ b/JETAN/AliAnalysisTaskJets.cxx
@@ -23,7 +23,7 @@
 #include "AliAnalysisTaskJets.h"
 #include "AliAnalysisManager.h"
 #include "AliJetFinder.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliAODEvent.h"
 #include "AliAODHandler.h"
 
@@ -65,6 +65,7 @@ void AliAnalysisTaskJets::CreateOutputObjects()
 // Create the output container
 //
 //  Default AOD
+    if (fDebug > 1) printf("AnalysisTaskJets::CreateOutPutData() \n");
     AliAODHandler* handler = (AliAODHandler*) ((AliAnalysisManager::GetAnalysisManager())->GetEventHandler());
     fAOD   = handler->GetAOD();
     fTreeA = handler->GetTree();
@@ -92,22 +93,10 @@ void AliAnalysisTaskJets::Init()
 void AliAnalysisTaskJets::ConnectInputData(Option_t */*option*/)
 {
 // Connect the input data
-//
     if (fDebug > 1) printf("AnalysisTaskJets::ConnectInputData() \n");
     fChain = (TChain*)GetInputData(0);
-
-    char ** address = (char **)GetBranchAddress(0, "ESD");
-    if (address)     {
-	
-// Branch has been already connected
-	fESD = (AliESD*)(*address);
-    }
-    else     {
-// First task taking the branch enables it
-	fESD = new AliESD();
-	SetBranchAddress(0, "ESD", &fESD);
-    }
-    
+    fESD = new AliESDEvent();
+    fESD->ReadFromTree(fChain);
     fJetFinder->ConnectTree(fChain, fESD);
 }
 
diff --git a/JETAN/AliAnalysisTaskJets.h b/JETAN/AliAnalysisTaskJets.h
index 831ac8bf1d7..8210f30928d 100644
--- a/JETAN/AliAnalysisTaskJets.h
+++ b/JETAN/AliAnalysisTaskJets.h
@@ -6,7 +6,7 @@
  
 #include "AliAnalysisTask.h"
 class AliJetFinder;
-class AliESD;
+class AliESDEvent;
 class TChain;
 class AliAODEvent;
 
@@ -29,7 +29,7 @@ class AliAnalysisTaskJets : public AliAnalysisTask
     Int_t         fDebug;     //  Debug flag
     AliJetFinder* fJetFinder; //  Pointer to the jet finder 
     TChain*       fChain;     //! chained files
-    AliESD*       fESD;       //! ESD
+    AliESDEvent*  fESD;       //! ESD
     AliAODEvent*  fAOD;       //! AOD
     TTree*        fTreeA;     //  tree of reconstructed jets
     TH1F*         fHisto;     //  Histogram
diff --git a/JETAN/AliJetESDReader.cxx b/JETAN/AliJetESDReader.cxx
index af7e1677344..c82e143c950 100755
--- a/JETAN/AliJetESDReader.cxx
+++ b/JETAN/AliJetESDReader.cxx
@@ -29,7 +29,7 @@
 
 #include "AliJetESDReader.h"
 #include "AliJetESDReaderHeader.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliESDtrack.h"
 //#include "AliEMCALGeometry.h"
 #include "AliJetDummyGeo.h"
@@ -119,8 +119,8 @@ void AliJetESDReader::OpenInputFiles()
 
 void AliJetESDReader::ConnectTree(TTree* tree, TObject* data) {
     // Connect the tree
-     fChain = (TChain*) tree;
-     fESD   = (AliESD*) data;
+     fChain = (TChain*)      tree;
+     fESD   = (AliESDEvent*) data;
      
      Int_t nMax = fChain->GetEntries(); 
      printf("\n AliJetESDReader: Total number of events in chain= %5d \n", nMax);
@@ -156,6 +156,8 @@ Bool_t AliJetESDReader::FillMomentumArray(Int_t event)
   
   // get number of tracks in event (for the loop)
   nt = fESD->GetNumberOfTracks();
+  printf("Fill Momentum Array %5d ", nt);
+  
   // temporary storage of signal and pt cut flag
   Int_t* sflag  = new Int_t[nt];
   Int_t* cflag  = new Int_t[nt];
diff --git a/JETAN/AliJetESDReader.h b/JETAN/AliJetESDReader.h
index 4cdfd2f9d01..8074fdfe62d 100755
--- a/JETAN/AliJetESDReader.h
+++ b/JETAN/AliJetESDReader.h
@@ -23,7 +23,7 @@ class AliJetDummyGeo;
 class AliJetHadronCorrection;
 class AliJetUnitArray;
 class AliJetReaderHeader;
-class AliESD;
+class AliESDEvent;
 
 class AliJetESDReader : public AliJetReader
 {
@@ -46,7 +46,7 @@ class AliJetESDReader : public AliJetReader
  protected:
   AliJetDummyGeo             *fGeom;             //! EMCAL Geometry 
   TChain                     *fChain;            //! chain for reconstructed tracks
-  AliESD                     *fESD;              //! pointer to esd
+  AliESDEvent                *fESD;              //! pointer to esd
   AliJetHadronCorrectionv1   *fHadCorr;          //! Pointer to Hadron Correction Object 
   AliJetGrid                 *fTpcGrid;          //! Pointer to grid object
   AliJetGrid                 *fEmcalGrid;        //! Pointer to grid object
diff --git a/JETAN/AliJetESDmcReader.cxx b/JETAN/AliJetESDmcReader.cxx
index 5b6318e5851..258088c47d7 100644
--- a/JETAN/AliJetESDmcReader.cxx
+++ b/JETAN/AliJetESDmcReader.cxx
@@ -27,7 +27,7 @@
 #include <TMath.h>
 #include "AliJetESDmcReader.h"
 #include "AliJetESDReaderHeader.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliESDtrack.h"
 #include "AliHeader.h"
 
diff --git a/JETAN/AliJetMCReader.cxx b/JETAN/AliJetMCReader.cxx
index 13ce4967c94..60078620d90 100644
--- a/JETAN/AliJetMCReader.cxx
+++ b/JETAN/AliJetMCReader.cxx
@@ -28,7 +28,7 @@
 // From AliRoot ...
 #include "AliJetMCReader.h"
 #include "AliJetMCReaderHeader.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 #include "AliESDtrack.h"
 
 ClassImp(AliJetMCReader)
-- 
2.39.3