changed the order of call of endofcycle so that images are produced

[u/mrichter/AliRoot.git] / JETAN / AliJetAODReader.h

diff --git a/JETAN/AliJetAODReader.h b/JETAN/AliJetAODReader.h
index d11bbb2507b83e8fba200eaac1f649adb07eb9a8..81d35165d8b4414313fc6dfcdf3b6c9770634e89 100644 (file)
--- a/JETAN/AliJetAODReader.h
+++ b/JETAN/AliJetAODReader.h
@@ -18,6 +18,7 @@ class AliJetDummyGeo;
 class AliJetHadronCorrection;
 class AliJetAODReaderHeader;
 class AliJetReaderHeader;
+class AliAODMCParticle;
 class AliAODEvent;
 class TRefArray;
 
@@ -30,35 +31,38 @@ class AliJetAODReader : public AliJetReader
   TRefArray*   GetReferences() const {return fRef;}
 
   Bool_t FillMomentumArray(); 
+  static Bool_t AcceptAODMCParticle(AliAODMCParticle *mcP,Short_t flag);
+
   void   OpenInputFiles();
   void   ConnectTree(TTree* tree, TObject* data);
   void   InitUnitArray();
   void   CreateTasks(TChain* tree);
   Bool_t ExecTasks(Bool_t procid, TRefArray* refArray);
 
-  void SetInputEvent(TObject* /*esd*/, TObject* aod, TObject* /*mc*/) {fAOD = (AliAODEvent*) aod;}
+  void SetInputEvent(const TObject* /*esd*/, const TObject* aod, const TObject* /*mc*/) {fAOD = (AliAODEvent*) aod;}
   void SetTPCGrid(AliJetGrid *grid)   {fTpcGrid = grid;}
   void SetEMCalGrid(AliJetGrid *grid) {fEmcalGrid = grid;}
   // Correction of hadronic energy
-  void SetHadronCorrection(Int_t flag = 1) {fHCorrection = flag;}
+  void SetHadronCorrection(const Int_t flag = 1) {fHCorrection = flag;}
   void SetHadronCorrector(AliJetHadronCorrection* corr) {fHadCorr = corr;}
-  void SetApplyElectronCorrection(Int_t flag = 1) {fECorrection = flag; fEFlag=kTRUE;}
-  void SetApplyMIPCorrection(Bool_t val);
+  void SetApplyElectronCorrection(const Int_t flag = 1) {fECorrection = flag; fEFlag=kTRUE;}
+  void SetApplyMIPCorrection(const Bool_t val);
   void SetApplyFractionHadronicCorrection(Bool_t val);
   void SetFractionHadronicCorrection(Double_t val);
 
 
  private:
   Bool_t SetEMCALGeometry();
+  Bool_t FillMomentumArrayMC();
+
+
   void InitParameters();
   AliJetAODReader(const AliJetAODReader &det);
   AliJetAODReader &operator=(const AliJetAODReader &det);
 
  private:
-  TChain                     *fChain;  //! chain for reconstructed tracks
-  TChain                     *fTree;   //! tree to get the EMCal geometry
   AliAODEvent                *fAOD;    //! pointer to aod
-  TRefArray                  *fRef;    // pointer to array of references to tracks
+  TRefArray                  *fRef;    //! pointer to array of references to tracks
   Int_t                       fDebug;  // Debug option
   Int_t                       fOpt;    // Detector to be used for jet reconstruction
   AliJetDummyGeo             *fGeom;             //! EMCAL Geometry
@@ -72,9 +76,7 @@ class AliJetAODReader : public AliJetReader
   AliJetGrid                 *fGrid3;            // Pointer to grid object
   AliJetGrid                 *fGrid4;            // Pointer to grid object
   Float_t                     fPtCut;            // Pt cut for tracks to minimise background contribution
-  Int_t                       fHCorrection;      // Hadron correction flag
   Int_t                       fApplyElectronCorrection;      // Electron correction flag
-  Bool_t                      fEFlag;            // if (fEFlag == kFALSE) => fECorrection automatically setted
   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
@@ -86,12 +88,8 @@ class AliJetAODReader : public AliJetReader
   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
-
-
   ClassDef(AliJetAODReader,1)
 };