X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=JETAN%2FAliJetReader.h;h=c5b05261764dfcaf0637a994e5701411f09a090b;hb=3419308c2b9505a4747c96fc07c85c2a15318d89;hp=0c08ee9cf85f54cbcd0a88cdf9ac04aa8fb9677f;hpb=de26523029b5bc429e6dd61e1dca0b13de12eaa7;p=u%2Fmrichter%2FAliRoot.git

diff --git a/JETAN/AliJetReader.h b/JETAN/AliJetReader.h
old mode 100755
new mode 100644
index 0c08ee9cf85..c5b05261764
--- a/JETAN/AliJetReader.h
+++ b/JETAN/AliJetReader.h
@@ -3,26 +3,22 @@
  
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
+
+/* $Id$ */
  
 // Jet reader base class
 // manages the reading of input for jet algorithms
 // Authors: jgcn@mda.cinvestav.mx
-//          Magali Estienne <magali.estienne@IReS.in2p3.fr>  
+//          Magali Estienne <magali.estienne@subatech.in2p3.fr>  
+//          alexandre.shabetai@cern.ch
 
 #include <TObject.h>
-#include <TChain.h>
-#include <TArrayI.h>
-#ifndef ROOT_TTask
-#include "TTask.h"
-#endif
 
-class TTree;
-class TTask;
-class TClonesArray;
 class AliJetReaderHeader;
-class AliJetUnitArray;
-class AliJetHadronCorrectionv1;
-class AliJet;
+class AliJetFillCalTrkEvent;
+class AliJetCalTrkEvent;
+class AliVEvent;
+class AliMCEvent;
 
 class AliJetReader : public TObject 
 {
@@ -31,47 +27,36 @@ class AliJetReader : public TObject
   virtual ~AliJetReader();
 
   // Getters
-  virtual TClonesArray *GetMomentumArray() {return fMomentumArray;}
-
-  virtual AliJetUnitArray     *GetUnitArray() const {return fUnitArray;}  
-  virtual AliJetUnitArray     *GetUnitArrayNoCuts() const {return fUnitArrayNoCuts;}
-  
-  virtual AliJetReaderHeader* GetReaderHeader() { return fReaderHeader;}
-  virtual Int_t GetSignalFlag(Int_t i) const {return fSignalFlag[i];}
-  virtual Int_t GetCutFlag(Int_t i)    const {return fCutFlag[i];}
-  virtual Int_t GetArrayInitialised() {return fArrayInitialised;}
+  AliJetCalTrkEvent*        GetCalTrkEvent()       const {return fCalTrkEvent;}
+  AliJetReaderHeader*       GetReaderHeader()      const {return fReaderHeader;}
   
   // Setters
-  virtual Bool_t FillMomentumArray(Int_t) {return kTRUE;}
-  virtual void   FillUnitArrayFromTPCTracks(Int_t) {}     // temporarily not used
-  virtual void   FillUnitArrayFromEMCALHits() {}          // temporarily not used
-  virtual void   FillUnitArrayFromEMCALDigits(Int_t) {}   // temporarily not used
-  virtual void   FillUnitArrayFromEMCALClusters(Int_t) {} // temporarily not used
-  virtual void   InitUnitArray() {}
-  virtual void   SetReaderHeader(AliJetReaderHeader* header) 
-      {fReaderHeader = header;}
-	  
+  void                      SetReaderHeader(AliJetReaderHeader* header)      {fReaderHeader = header;}  
+
   // Others
-  virtual void   OpenInputFiles() {}
-  virtual void   ConnectTree(TTree* /*tree*/) {}
-  virtual Bool_t GetGenJets(AliJet* /*genJets*/) {return kFALSE;}
-  
-  void ClearArray();
+  void                      SetInputEvent(const TObject* esd, const TObject* aod, const AliMCEvent* mc);
+  void                      InitTasks();
+  Bool_t                    CreateTasks();
+  Bool_t                    ExecTasks();
+  Bool_t                    ProcessEvent();
+  void                      WriteRHeaderToFile() const;
+  void                      WriteReaderHeader();
  
  protected:
   AliJetReader(const AliJetReader& rJetReader);
   AliJetReader& operator = (const AliJetReader& rhsr);
-  TClonesArray            *fMomentumArray;    // array of particle momenta
-  TClonesArray            *fArrayMC;          //! array of mc particles
-  TTask                   *fFillUnitArray;    //! task list for filling the UnitArray
-  AliJetReaderHeader      *fReaderHeader;     // pointer to header
-  TArrayI                  fSignalFlag;       // to flag if a particle comes from pythia or
-                                              // from the underlying event
-  TArrayI                  fCutFlag;          // to flag if a particle passed the pt cut or not
-  AliJetUnitArray         *fUnitArray;        //! array of digit position and energy 
-  AliJetUnitArray         *fUnitArrayNoCuts;  //! array of digit position and energy 
-  Bool_t                   fArrayInitialised; // To check that array of units is initialised  
-  ClassDef(AliJetReader,1)
+
+  AliJetCalTrkEvent*        fCalTrkEvent;                     //! Pointer to calTrkEvent
+  AliJetFillCalTrkEvent*    fFillEvent;                       //! Pointer to AliJetFillCalTrkEvent
+  AliJetReaderHeader*       fReaderHeader;                    //  Pointer to header
+  AliJetFillCalTrkEvent*    fFillEventwTrks;                  //  For charged particle task
+  Int_t                     fDebug;                           //  Debug option
+  AliVEvent*                fVEvent;                          //! Input event
+  AliMCEvent*               fMCEvent;			      //! MC Event;
+  Int_t                     fOpt;                             //  Detector config
+  
+  ClassDef(AliJetReader,2)                                    // jet reader class
+
 };
  
 #endif