X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PYTHIA6%2FAliGenPythia.h;h=3d711fdfff487a84817fe14ee78679e9c5900d7a;hb=c2d4dbcf22f5a002acc2e82fc70c1915d12e1419;hp=83eef4e4369d8f1e0dcf27756af2f6d5e9678501;hpb=38112f3f69201dd8c38d837921099d36488f2541;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PYTHIA6/AliGenPythia.h b/PYTHIA6/AliGenPythia.h
index 83eef4e4369..3d711fdfff4 100644
--- a/PYTHIA6/AliGenPythia.h
+++ b/PYTHIA6/AliGenPythia.h
@@ -147,7 +147,8 @@ class AliGenPythia : public AliGenMC
     void SetLength(Float_t length) {fLength = length;}
 
     virtual void SetHadronisation(Int_t flag = 1) {fHadronisation = flag;}
-    virtual void SetReadFromFile(const Text_t *filname) {fFileName = filname;  fReadFromFile = 1;}    
+    virtual void SetPatchOmegaDalitz(Int_t flag = 1) {fPatchOmegaDalitz = flag;}
+    virtual void SetReadFromFile(const Text_t *filname) {fkFileName = filname;  fReadFromFile = 1;}    
 
     //
     // Pile-up
@@ -165,7 +166,7 @@ class AliGenPythia : public AliGenMC
 			     Float_t minet = 10., Float_t r = 1.);
     
   void LoadEvent(AliStack* stack, Int_t flag = 0, Int_t reHadr = 0);
-  void LoadEvent(TObjArray* stack, Int_t flag = 0, Int_t reHadr = 0);
+  void LoadEvent(const TObjArray* stack, Int_t flag = 0, Int_t reHadr = 0);
     // Getters
     virtual Process_t    GetProcess() const {return fProcess;}
     virtual StrucFunc_t  GetStrucFunc() const {return fStrucFunc;}
@@ -182,11 +183,11 @@ class AliGenPythia : public AliGenMC
     virtual void         GetGammaPhiRange(Float_t& phimin, Float_t& phimax) const
 	{phimin = fPhiMinGamma*180./TMath::Pi(); phimax = fPhiMaxGamma*180./TMath::Pi();}
     //
-    Bool_t IsInEMCAL(Float_t phi, Float_t eta);
-    Bool_t IsInPHOS(Float_t phi, Float_t eta);
+    Bool_t IsInEMCAL(Float_t phi, Float_t eta) const;
+    Bool_t IsInPHOS(Float_t phi, Float_t eta) const;
     //
     virtual void FinishRun();
-    Bool_t CheckTrigger(TParticle* jet1, TParticle* jet2);
+    Bool_t CheckTrigger(const TParticle* jet1, const TParticle* jet2);
     //Used in some processes to selected child properties
     Bool_t CheckKinematicsOnChild();
     void     GetSubEventTime();
@@ -222,6 +223,7 @@ class AliGenPythia : public AliGenMC
     Int_t       fGinit;             //initial state gluon radiation
     Int_t       fGfinal;            //final state gluon radiation
     Int_t       fHadronisation;     //hadronisation
+    Bool_t      fPatchOmegaDalitz;  //flag for omega dalitz decay patch
     Int_t       fNpartons;          //Number of partons before hadronisation
     Int_t       fReadFromFile;      //read partons from file
     Int_t       fQuench;            //Flag for quenching
@@ -277,7 +279,7 @@ class AliGenPythia : public AliGenMC
 
     AliGenPythiaEventHeader* fHeader;  //! Event header
     AliRunLoader*            fRL;      //! Run Loader
-    const Text_t* fFileName;           //! Name of file to read from
+    const Text_t* fkFileName;          //! Name of file to read from
 
 
     Bool_t fFragPhotonInCalo; // Option to ask for Fragmentation Photon in calorimeters acceptance
@@ -297,12 +299,11 @@ class AliGenPythia : public AliGenMC
     Float_t fEMCALMinPhi;          // Minimum phi EMCAL
     Float_t fEMCALMaxPhi;          // Maximum phi EMCAL
     Float_t fEMCALEta;             // Maximum eta EMCAL
-
  private:
     AliGenPythia(const AliGenPythia &Pythia);
     AliGenPythia & operator=(const AliGenPythia & rhs);
 
-    ClassDef(AliGenPythia,9) // AliGenerator interface to Pythia
+    ClassDef(AliGenPythia, 10) // AliGenerator interface to Pythia
 };
 #endif