Use AliESDEvent instead of AliESD.

diff --git a/JETAN/AliAnalysisTaskJets.cxx b/JETAN/AliAnalysisTaskJets.cxx
index 674cec0abcaab85d0404fea3a4b4daf137709772..fdb43e53cae364d87b53c1b2829a856807f7ccb9 100644 (file)
--- 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 831ac8bf1d76541a6db8539bc9f5c3b50c889e82..8210f30928d1369ca94e402ab2e91d8ae89953c1 100644 (file)
--- 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 af7e1677344067ed6c3531fc468d98bed1def5e3..c82e143c950818101013f06f0169e267a71dc358 100755 (executable)
--- 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 4cdfd2f9d01da1b8cf35869c767a17d93ce92f85..8074fdfe62d58eac383fd80c4cfa324ab700ab1c 100755 (executable)
--- 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 5b6318e5851b6317fac69d62e7c0c5b988a29f4f..258088c47d71f0593fb59cdefa71675100fdb8e6 100644 (file)
--- 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 13ce4967c943950351f96c24dde4d4c5ecae83af..60078620d90f661a4b962af23143031516ce2195 100644 (file)
--- 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)