Obsolete structure functions replaced.

diff --git a/PYTHIA6/AliGenPythia.h b/PYTHIA6/AliGenPythia.h
index 9c66dde1e83edecf5ce68b0b2d3ae7d581c6c6ac..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; }

diff --git a/PYTHIA6/AliPythia.h b/PYTHIA6/AliPythia.h
index c812b730b1cec3d65c825b524fcf96178bc4fecb..4f534aafdd8fcd15545a9e1b48676231db0686b5 100644 (file)
--- a/PYTHIA6/AliPythia.h
+++ b/PYTHIA6/AliPythia.h
@@ -8,6 +8,7 @@
 #include <TPythia6.h>
 #include <AliRndm.h>
 #include <AliStructFuncType.h>
+
 typedef enum
 {kPyCharm, kPyBeauty, kPyCharmUnforced, kPyBeautyUnforced,
  kPyJpsi, kPyJpsiChi, kPyMb, kPyMbNonDiffr, kPyJets, kPyDirectGamma,
@@ -17,24 +18,7 @@ typedef enum
  kPyBeautyppMNR, kPyBeautyppMNRwmi, kPyW, kPyZ, kPyMbMSEL1,
  kPyOldUEQ2ordered, kPyOldUEQ2ordered2, kPyOldPopcorn}
 Process_t;
-/*
-typedef enum
-{
-    kDOSet1     = 1006,
-    kGRVLO      = 5005,
-    kGRVHO      = 5006,
-    kMRSDminus  = 3031,
-    kMRSD0      = 3030,
-    kMRSG       = 3041,
-    kCTEQ2pM    = 4024,
-    kCTEQ4L     = 4032,
-    kCTEQ4M     = 4034,
-    kMRSTcgLO   = 3072,
-    kCTEQ5L     = 4046,
-    kGRVLO98    = 5012
-}
-StrucFunc_t;
-*/
+
 class AliFastGlauber;
 class AliQuenchingWeights;