Method SetInputEvent introduced.

diff --git a/JETAN/AliJetAODReader.h b/JETAN/AliJetAODReader.h
index 903075c606b011a2fa3e25a6801cfbb6c500a51f..3f9925d3a0c3c64f4a2a33021f07df0481367565 100644 (file)
--- a/JETAN/AliJetAODReader.h
+++ b/JETAN/AliJetAODReader.h
@@ -27,7 +27,7 @@ class AliJetAODReader : public AliJetReader
   Bool_t FillMomentumArray(Int_t event); 
   void   OpenInputFiles();
   void   ConnectTree(TTree* tree, TObject* data);
-  void   SetEvent(TObject *ev) {fAOD = (AliAODEvent*) ev;}
+  void   SetInputEvent(TObject* /*esd*/, TObject* aod, TObject* /*mc*/) {fAOD = (AliAODEvent*) aod;}
 
  private:
   TChain                     *fChain;  //! chain for reconstructed tracks

diff --git a/JETAN/AliJetESDReader.cxx b/JETAN/AliJetESDReader.cxx
index 24cdcf0b653012adb8fc135fbbb6106dc1ba7bfe..3975f25e87618053d057cda27cd186e15f4a1707 100755 (executable)
--- a/JETAN/AliJetESDReader.cxx
+++ b/JETAN/AliJetESDReader.cxx
@@ -30,6 +30,7 @@
 #include "AliJetESDReader.h"
 #include "AliJetESDReaderHeader.h"
 #include "AliESDEvent.h"
+#include "AliESD.h"
 #include "AliESDtrack.h"
 //#include "AliEMCALGeometry.h"
 #include "AliJetDummyGeo.h"
@@ -117,20 +118,9 @@ void AliJetESDReader::OpenInputFiles()
   }
 }
 
-void AliJetESDReader::ConnectTree(TTree* tree, TObject* data) {
+void AliJetESDReader::SetInputEvent(TObject* esd, TObject* /*aod*/, TObject* /*mc*/) {
     // Connect the tree
-     fChain = (TChain*)      tree;
-     fESD   = (AliESDEvent*) data;
-     
-     Int_t nMax = fChain->GetEntries(); 
-     printf("\n AliJetESDReader: Total number of events in chain= %5d \n", nMax);
-     // set number of events in header
-     if (fReaderHeader->GetLastEvent() == -1)
-        fReaderHeader->SetLastEvent(nMax);
-     else {
-        Int_t nUsr = fReaderHeader->GetLastEvent();
-        fReaderHeader->SetLastEvent(TMath::Min(nMax,nUsr));
-     }
+     fESD   = (AliESDEvent*) esd;
 }
 
 //____________________________________________________________________________
@@ -147,16 +137,15 @@ Bool_t AliJetESDReader::FillMomentumArray(Int_t /*event*/)
   // clear momentum array
   ClearArray();
   fDebug = fReaderHeader->GetDebug();
-  // get event from chain
-  // fChain->GetTree()->GetEntry(event);
   
   if (!fESD) {
       return kFALSE;
   }
   
+
   // get number of tracks in event (for the loop)
   nt = fESD->GetNumberOfTracks();
-  printf("Fill Momentum Array %5d ", nt);
+  printf("Fill Momentum Array %5d  \n", nt);
   
   // temporary storage of signal and pt cut flag
   Int_t* sflag  = new Int_t[nt];

diff --git a/JETAN/AliJetESDReader.h b/JETAN/AliJetESDReader.h
index 8074fdfe62d58eac383fd80c4cfa324ab700ab1c..d5cdf59f3cde9ab6d9aa3d6c3a4e04c4cc0bda01 100755 (executable)
--- a/JETAN/AliJetESDReader.h
+++ b/JETAN/AliJetESDReader.h
@@ -34,7 +34,7 @@ class AliJetESDReader : public AliJetReader
   Bool_t FillMomentumArray(Int_t event); 
   void   OpenInputFiles();
   void   InitUnitArray();
-  void   ConnectTree(TTree* tree, TObject* data);
+  void   SetInputEvent(TObject* esd, TObject* aod, TObject* mc);
   virtual void SetTPCGrid(AliJetGrid *grid)   {fTpcGrid = grid;}
   virtual void SetEMCalGrid(AliJetGrid *grid) {fEmcalGrid = grid;}
   // Correction of hadronic energy

diff --git a/JETAN/AliJetReader.h b/JETAN/AliJetReader.h
index ea023b4edc90441dfe52382f21b07cda633af742..3b63c3282cd59d00a7675ce4102322621fddacae 100755 (executable)
--- a/JETAN/AliJetReader.h
+++ b/JETAN/AliJetReader.h
@@ -43,7 +43,6 @@ class AliJetReader : public TObject
   virtual Int_t GetArrayInitialised()               const {return fArrayInitialised;}
   
   // Setters
-  virtual void   SetEvent(TObject */*ev*/) {}
   virtual Bool_t FillMomentumArray(Int_t) {return kTRUE;}
   virtual void   FillUnitArrayFromTPCTracks(Int_t) {}     // temporarily not used
   virtual void   FillUnitArrayFromEMCALHits() {}          // temporarily not used
@@ -55,6 +54,7 @@ class AliJetReader : public TObject
          
   // Others
   virtual void   OpenInputFiles() {}
+  virtual void   SetInputEvent(TObject* /*esd*/, TObject* /*aod*/, TObject* /*mc*/) {;}
   virtual void   ConnectTree(TTree* /*tree*/, TObject* /*data*/) {}
   virtual Bool_t GetGenJets(AliJet* /*genJets*/) {return kFALSE;}