New methods in geometry, update geometry for 3x3 case

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

diff --git a/PYTHIA6/AliGenPythia.h b/PYTHIA6/AliGenPythia.h
index a8d3f24cfd5807dab694acbb8395ac8b044932f2..5a21ddd206f746d0f628ec6db7063ad9a6f88229 100644 (file)
--- a/PYTHIA6/AliGenPythia.h
+++ b/PYTHIA6/AliGenPythia.h
@@ -46,7 +46,7 @@ class AliGenPythia : public AliGenMC
     // select process type
     virtual void    SetProcess(Process_t proc = kPyCharm) {fProcess = proc;}
     // select structure function
-    virtual void    SetStrucFunc(StrucFunc_t func = kGRVHO) {fStrucFunc = func;}
+    virtual void    SetStrucFunc(StrucFunc_t func =  kCTEQ5L) {fStrucFunc = func;}
     // select pt of hard scattering 
     virtual void    SetPtHard(Float_t ptmin = 0, Float_t ptmax = 1.e10)
        {fPtHardMin = ptmin; fPtHardMax = ptmax; }
@@ -107,7 +107,7 @@ class AliGenPythia : public AliGenMC
     // get cross section of process
     virtual Float_t GetXsection() const {return fXsection;}
     // get triggered jets
-    void GetJets(Int_t& njets, Int_t& ntrig, Float_t[4][10]);
+    void GetJets(Int_t& njets, Int_t& ntrig, Float_t jets[4][10]);
     void RecJetsUA1(Int_t& njets, Float_t jets[4][50]);
     void SetPycellParameters(Float_t etamax = 2., Int_t neta = 274, Int_t nphi = 432,
                             Float_t thresh = 0., Float_t etseed = 4.,
@@ -115,20 +115,20 @@ class AliGenPythia : public AliGenMC
     
     void LoadEvent(AliStack* stack, Int_t flag = 0, Int_t reHadr = 0);
     // Getters
-    virtual Process_t    GetProcess() {return fProcess;}
-    virtual StrucFunc_t  GetStrucFunc() {return fStrucFunc;}
-    virtual void         GetPtHard(Float_t& ptmin, Float_t& ptmax)
+    virtual Process_t    GetProcess() const {return fProcess;}
+    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() {return fEnergyCMS;}
-    virtual void         GetNuclei(Int_t&  a1, Int_t& a2)
+    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)
+    virtual void         GetJetEtRange(Float_t& etamin, Float_t& etamax) const
        {etamin = fEtaMinJet; etamax = fEtaMaxJet;}
-    virtual void         GetJetPhiRange(Float_t& phimin, Float_t& phimax)
+    virtual void         GetJetPhiRange(Float_t& phimin, Float_t& phimax) const
        {phimin = fPhiMinJet*180./TMath::Pi(); phimax = fPhiMaxJet*180/TMath::Pi();}
-    virtual void         GetGammaEtaRange(Float_t& etamin, Float_t& etamax)
+    virtual void         GetGammaEtaRange(Float_t& etamin, Float_t& etamax) const
        {etamin = fEtaMinGamma; etamax = fEtaMaxGamma;}
-    virtual void         GetGammaPhiRange(Float_t& phimin, Float_t& phimax)
+    virtual void         GetGammaPhiRange(Float_t& phimin, Float_t& phimax) const
        {phimin = fPhiMinGamma*180./TMath::Pi(); phimax = fPhiMaxGamma*180./TMath::Pi();}
     //
     virtual void FinishRun();
@@ -145,7 +145,7 @@ class AliGenPythia : public AliGenMC
     
  protected:
     // adjust the weight from kinematic cuts
-    void     AdjustWeights();
+    void     AdjustWeights() const;
     Int_t    GenerateMB();
     void     MakeHeader();    
     void     GeneratePileup();