X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=JETAN%2FAliJetESDReader.h;h=2755fc8e7fc5ddc1cf34ee3a55e48df77669d15b;hb=618038b6cfc6ac5f8e2b739c9bda4ba9d50773dd;hp=242384b387c981e61a7cf2326c5dfd15486ebcda;hpb=5b81d1ced0d3775b3236b61544c050484724aea6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/JETAN/AliJetESDReader.h b/JETAN/AliJetESDReader.h
index 242384b387c..2755fc8e7fc 100755
--- a/JETAN/AliJetESDReader.h
+++ b/JETAN/AliJetESDReader.h
@@ -11,59 +11,81 @@
 //=========================================================================
 // Modified in order to use a fUnitArray object instead of a fMomentumArray
 // Includes EMCal Geometry, fUnitArray, grid objects and tools for Hadron correction
-// Author : magali.estienne@ires.in2p3.fr
+// Author : magali.estienne@subatech.in2p3.fr
 //---------------------------------------------------------------------
 
 #include "AliJetReader.h"
 #include "AliJetUnitArray.h"
 #include "AliJetGrid.h"
+
+class TRefArray;
 class AliJetESDReaderHeader;
 class AliEMCALGeometry;
-class AliJetDummyGeo;
+class AliEMCALGeometry;
 class AliJetHadronCorrection;
 class AliJetUnitArray;
 class AliJetReaderHeader;
-class AliESD;
+class AliESDEvent;
 
 class AliJetESDReader : public AliJetReader
 {
  public: 
   AliJetESDReader();
   virtual ~AliJetESDReader();
+
+  Bool_t     FillMomentumArray(); 
+  void       OpenInputFiles();
+  void       InitUnitArray();
+  void       CreateTasks(TChain* tree);
+  Bool_t     ExecTasks(const Bool_t procid, TRefArray* refArray);
+
+  // Getters
+  Float_t    GetTrackMass() const {return fMass;}  // returns mass of the track
+  Int_t      GetTrackSign() const {return fSign;}  // returns sign of the track
+ 
   // Setters
-  Bool_t FillMomentumArray(Int_t event); 
-  void   OpenInputFiles();
-  void   InitUnitArray();
-  void   ConnectTree(TTree* tree);
-  virtual void SetTPCGrid(AliJetGrid *grid)   {fTpcGrid = grid;}
-  virtual void SetEMCalGrid(AliJetGrid *grid) {fEmcalGrid = grid;}
+  void       SetInputEvent(const TObject* esd, const TObject* aod, const TObject* mc);
+  void       SetTPCGrid(AliJetGrid *grid)   {fTpcGrid = grid;}
+  void       SetEMCalGrid(AliJetGrid *grid) {fEmcalGrid = grid;}
   // Correction of hadronic energy
-  virtual void SetHadronCorrection(Int_t flag = 1) {fHCorrection = flag;}
-  virtual void SetHadronCorrector(AliJetHadronCorrectionv1* corr) {fHadCorr = corr;}
- private:
-  void SetEMCALGeometry();
-  void InitParameters();
+  void       SetHadronCorrector(AliJetHadronCorrection* corr) {fHadCorr = corr;}
+  void       SetApplyElectronCorrection(Int_t flag = 1) {fECorrection = flag; fEFlag=kTRUE;}
+  void       SetApplyMIPCorrection(Bool_t val);
+  void       SetApplyFractionHadronicCorrection(Bool_t val);
+  void       SetFractionHadronicCorrection(Double_t val);
+
  protected:
-  AliJetDummyGeo             *fGeom;             //!EMCAL Geometry 
-  TChain                     *fChain;            // chain for reconstructed tracks
-  AliESD                     *fESD;              // pointer to esd
-  AliJetHadronCorrectionv1   *fHadCorr;          // Pointer to Hadron Correction Object 
-  AliJetGrid                 *fTpcGrid;          // Pointer to grid object
-  AliJetGrid                 *fEmcalGrid;        // Pointer to grid object
-  Float_t                     fPtCut;            // Pt cut for tracks to minimise background contribution
-  Int_t                       fHCorrection;      // Hadron correction flag
+  AliJetHadronCorrection     *fHadCorr;          //! Pointer to Hadron Correction Object 
+  AliJetGrid                 *fTpcGrid;          //! Pointer to grid object
+  AliJetGrid                 *fEmcalGrid;        //! Pointer to grid object
+  AliJetGrid                 *fGrid0;            // Pointer to grid object
+  AliJetGrid                 *fGrid1;            // Pointer to grid object
+  AliJetGrid                 *fGrid2;            // Pointer to grid object
+  AliJetGrid                 *fGrid3;            // Pointer to grid object
+  AliJetGrid                 *fGrid4;            // Pointer to grid object
+  Int_t                       fApplyElectronCorrection;      // Electron correction flag
+  Bool_t                      fApplyMIPCorrection; // Apply MIP or not ? Exclusive with fApplyFractionHadronicCorrection
+  Bool_t                      fApplyFractionHadronicCorrection; // Another type of charged particle energy deposition in EMC
+  Double_t                    fFractionHadronicCorrection; // Fraction of momentum of the TPC track to be subtracted from EMC tower
   Int_t                       fNumUnits;         // Number of units in the unit object array
                                                  // (same as num towers in EMCAL)
-  Int_t                       fDebug;            // Debug option
+  Int_t                       fDebug;            //! Debug option
+  Float_t                     fMass;             // Particle mass
+  Int_t                       fSign;             // Particle sign
   Int_t                       fNIn;              // Number of Array filled in UnitArray
   Int_t                       fOpt;              // Detector to be used for jet reconstruction
+  Bool_t                      fDZ;               // Use or not dead zones
   Int_t                       fNeta;             // Number of bins in eta of tpc grid
   Int_t                       fNphi;             // Number of bins in phi of tpc grid
-  Bool_t                      fArrayInitialised; // To check that array of units is initialised
-  
+  TRefArray                  *fRefArray;         // array of digit position and energy
+  Bool_t                      fProcId;           // Bool_t for TProcessID synchronization
+  void InitParameters();
+  AliJetESDReader(const AliJetESDReader &det);
+  AliJetESDReader &operator=(const AliJetESDReader &det);
+
 
 
-  ClassDef(AliJetESDReader,1)
+  ClassDef(AliJetESDReader,2)
 };
  
 #endif