update from Prabhat

[u/mrichter/AliRoot.git] / PYTHIA6 / AliGenPythiaPlus.h

diff --git a/PYTHIA6/AliGenPythiaPlus.h b/PYTHIA6/AliGenPythiaPlus.h
index 366e96bd7c1336986bfcde331f241c7bdc816413..6f7bc8f6b2f5da50184e06e4529ad119eb0f4ebf 100644 (file)
--- a/PYTHIA6/AliGenPythiaPlus.h
+++ b/PYTHIA6/AliGenPythiaPlus.h
@@ -153,7 +153,6 @@ class AliGenPythiaPlus : public AliGenMC
     virtual StrucFunc_t  GetStrucFunc() const {return fStrucFunc;}
     virtual void         GetPtHard(Float_t& ptmin, Float_t& ptmax) const
        {ptmin = fPtHardMin; ptmax = fPtHardMax;}
-    virtual Float_t      GetEnergyCMS() const {return fEnergyCMS;}
     virtual void         GetNuclei(Int_t&  a1, Int_t& a2) const
        {a1 = fAProjectile; a2 = fATarget;}
     virtual void         GetJetEtRange(Float_t& etamin, Float_t& etamax) const
@@ -165,15 +164,16 @@ class AliGenPythiaPlus : 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();
-
+    virtual void    SetTune(Int_t itune) {fItune = itune;}
+    virtual void    SetInfo(Int_t info)  {fInfo  = info;}
  protected:
     // adjust the weight from kinematic cuts
     void     AdjustWeights() const;
@@ -183,7 +183,6 @@ class AliGenPythiaPlus : public AliGenMC
     AliPythiaBase *fPythia;         //!Pythia 
     Process_t   fProcess;           //Process type
     StrucFunc_t fStrucFunc;         //Structure Function
-    Float_t     fEnergyCMS;         //Centre of mass energy
     Float_t     fKineBias;          //!Bias from kinematic selection
     Int_t       fTrials;            //!Number of trials for current event
     Int_t       fTrialsRun;         //!Number of trials for run
@@ -271,12 +270,13 @@ class AliGenPythiaPlus : public AliGenMC
     Float_t fEMCALMinPhi;          // Minimum phi EMCAL
     Float_t fEMCALMaxPhi;          // Maximum phi EMCAL
     Float_t fEMCALEta;             // Maximum eta EMCAL
-
+    Int_t   fItune;                // Pythia tune 
+    Int_t   fInfo;                 // extented event info   
  private:
     AliGenPythiaPlus(const AliGenPythiaPlus &Pythia);
     AliGenPythiaPlus & operator=(const AliGenPythiaPlus & rhs);
 
-    ClassDef(AliGenPythiaPlus, 1) // AliGenerator interface to Pythia
+    ClassDef(AliGenPythiaPlus, 2) // AliGenerator interface to Pythia
 };
 #endif