]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - macros/ConfigPPR.C
Default shish-kebab geometry for EMCAL
[u/mrichter/AliRoot.git] / macros / ConfigPPR.C
index 461e651a7edfda387e4b93f15200cfd1ed751b3c..c37d30ee60e8500f20d8dd6d293c322cccbc7e23 100644 (file)
@@ -1,19 +1,35 @@
+// One can use the configuration macro in compiled mode by
+// root [0] gSystem->Load("libgeant321");
+// root [0] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\
+//                   -I$ALICE_ROOT -I$ALICE/geant3/TGeant3");
+// root [0] .x grun.C(1,"ConfigPPR.C++")
+
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
-#include <TGeant3.h>
+#include <TGeant3TGeo.h>
+#include <TPDGCode.h>
+#include <TF1.h>
 #include "STEER/AliRunLoader.h"
 #include "STEER/AliRun.h"
 #include "STEER/AliConfig.h"
 #include "STEER/AliGenerator.h"
+#include "STEER/AliLog.h"
 #include "PYTHIA6/AliDecayerPythia.h"
 #include "EVGEN/AliGenHIJINGpara.h"
 #include "THijing/AliGenHijing.h"
 #include "EVGEN/AliGenCocktail.h"
 #include "EVGEN/AliGenSlowNucleons.h"
 #include "EVGEN/AliSlowNucleonModelExp.h"
+#include "EVGEN/AliGenParam.h"
+#include "EVGEN/AliGenMUONlib.h"
+#include "EVGEN/AliGenSTRANGElib.h"
+#include "EVGEN/AliGenMUONCocktail.h"
+#include "EVGEN/AliGenCocktail.h"
+#include "EVGEN/AliGenGeVSim.h"
+#include "EVGEN/AliGeVSimParticle.h"
 #include "PYTHIA6/AliGenPythia.h"
 #include "STEER/AliMagFMaps.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliPIPEv0.h"
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
-#include "TOF/AliTOFv2FHoles.h"
 #include "TOF/AliTOFv4T0.h"
-#include "RICH/AliRICHv3.h"
+#include "RICH/AliRICHv1.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
+#include "MUON/AliMUONSt1GeometryBuilderV2.h"
+#include "MUON/AliMUONSt2GeometryBuilderV2.h"
+#include "MUON/AliMUONSlatGeometryBuilder.h"
+#include "MUON/AliMUONTriggerGeometryBuilder.h"
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
-#include "EMCAL/AliEMCALv1.h"
+#include "EMCAL/AliEMCALv2.h"
 #include "CRT/AliCRTv0.h"
-#include "VZERO/AliVZEROv2.h"
+#include "VZERO/AliVZEROv5.h"
 #endif
 
 enum PprRun_t 
@@ -49,7 +68,40 @@ enum PprRun_t
     kHijing_per1,  kHijing_per2, kHijing_per3, kHijing_per4,  kHijing_per5,
     kHijing_jj25,  kHijing_jj50, kHijing_jj75, kHijing_jj100, kHijing_jj200, 
     kHijing_gj25,  kHijing_gj50, kHijing_gj75, kHijing_gj100, kHijing_gj200,
-    kHijing_pA, kPythia6
+    kHijing_pA, kPythia6, 
+    kPythia6Jets20_24,   kPythia6Jets24_29,   kPythia6Jets29_35,
+    kPythia6Jets35_42,   kPythia6Jets42_50,   kPythia6Jets50_60,
+    kPythia6Jets60_72,   kPythia6Jets72_86,   kPythia6Jets86_104,
+    kPythia6Jets104_125, kPythia6Jets125_150, kPythia6Jets150_180,
+    kD0PbPb5500, kCharmSemiElPbPb5500, kBeautySemiElPbPb5500,
+    kCocktailTRD, kPyJJ, kPyGJ, 
+    kMuonCocktailCent1, kMuonCocktailPer1, kMuonCocktailPer4, 
+    kMuonCocktailCent1HighPt, kMuonCocktailPer1HighPt, kMuonCocktailPer4HighPt,
+    kMuonCocktailCent1Single, kMuonCocktailPer1Single, kMuonCocktailPer4Single,
+    kFlow_2_2000, kFlow_10_2000, kFlow_6_2000, kFlow_6_5000,
+    kHIJINGplus, kRunMax
+};
+
+const char* pprRunName[] = {
+    "test50",
+    "kParam_8000",   "kParam_4000",  "kParam_2000", 
+    "kHijing_cent1", "kHijing_cent2", 
+    "kHijing_per1",  "kHijing_per2", "kHijing_per3", "kHijing_per4",  
+    "kHijing_per5",
+    "kHijing_jj25",  "kHijing_jj50", "kHijing_jj75", "kHijing_jj100", 
+    "kHijing_jj200", 
+    "kHijing_gj25",  "kHijing_gj50", "kHijing_gj75", "kHijing_gj100", 
+    "kHijing_gj200", "kHijing_pA", "kPythia6", 
+    "kPythia6Jets20_24",   "kPythia6Jets24_29",   "kPythia6Jets29_35",
+    "kPythia6Jets35_42",   "kPythia6Jets42_50",   "kPythia6Jets50_60",
+    "kPythia6Jets60_72",   "kPythia6Jets72_86",   "kPythia6Jets86_104",
+    "kPythia6Jets104_125", "kPythia6Jets125_150", "kPythia6Jets150_180",
+    "kD0PbPb5500", "kCharmSemiElPbPb5500", "kBeautySemiElPbPb5500",
+    "kCocktailTRD", "kPyJJ", "kPyGJ", 
+    "kMuonCocktailCent1", "kMuonCocktailPer1", "kMuonCocktailPer4",  
+    "kMuonCocktailCent1HighPt", "kMuonCocktailPer1HighPt", "kMuonCocktailPer4HighPt",
+    "kMuonCocktailCent1Single", "kMuonCocktailPer1Single", "kMuonCocktailPer4Single",
+    "kFlow_2_2000", "kFlow_10_2000", "kFlow_6_2000", "kFlow_6_5000", "kHIJINGplus"
 };
 
 enum PprGeo_t 
@@ -70,10 +122,11 @@ enum PprMag_t
 
 // This part for configuration    
 //static PprRun_t srun = test50;
-static PprRun_t srun = kPythia6;
-static PprGeo_t sgeo = kHoles;
+static PprRun_t srun = kHIJINGplus;
+static PprGeo_t sgeo = kNoHoles;
 static PprRad_t srad = kGluonRadiation;
-static PprMag_t smag = k4kG;
+static PprMag_t smag = k5kG;
+static Int_t    sseed = 12345; //Set 0 to use the current time
 
 // Comment line 
 static TString  comment;
@@ -82,14 +135,19 @@ static TString  comment;
 Float_t EtaToTheta(Float_t arg);
 AliGenerator* GeneratorFactory(PprRun_t srun);
 AliGenHijing* HijingStandard();
+AliGenGeVSim* GeVSimStandard(Float_t, Float_t);
+void ProcessEnvironmentVars();
 
 void Config()
 {
     // ThetaRange is (0., 180.). It was (0.28,179.72) 7/12/00 09:00
     // Theta range given through pseudorapidity limits 22/6/2001
 
+    // Get settings from environment variables
+    ProcessEnvironmentVars();
+
     // Set Random Number seed
-  gRandom->SetSeed(12345); //Set 0 to use the current time
+    gRandom->SetSeed(sseed);
     cout<<"Seed for random number generation= "<<gRandom->GetSeed()<<endl; 
 
 
@@ -98,13 +156,13 @@ void Config()
     gSystem->Load("libgeant321");
 #endif
 
-    new     TGeant3("C++ Interface to Geant3");
+    new     TGeant3TGeo("C++ Interface to Geant3");
 
     AliRunLoader* rl=0x0;
 
     cout<<"Config.C: Creating Run Loader ..."<<endl;
     rl = AliRunLoader::Open("galice.root",
-                           AliConfig::fgkDefaultEventFolderName,
+                           AliConfig::GetDefaultEventFolderName(),
                            "recreate");
     if (rl == 0x0)
       {
@@ -119,7 +177,21 @@ void Config()
     // Set External decayer
     AliDecayer *decayer = new AliDecayerPythia();
 
-    decayer->SetForceDecay(kAll);
+
+    switch (srun) {
+    case kD0PbPb5500:
+      decayer->SetForceDecay(kHadronicD);
+      break;
+    case kCharmSemiElPbPb5500:
+      decayer->SetForceDecay(kSemiElectronic);
+      break;
+    case kBeautySemiElPbPb5500:
+      decayer->SetForceDecay(kSemiElectronic);
+      break;
+    default:
+      decayer->SetForceDecay(kAll);
+      break;
+    }
     decayer->Init();
     gMC->SetExternalDecayer(decayer);
     //
@@ -161,9 +233,11 @@ void Config()
     gMC->SetCut("PPCUTM", cut);
     gMC->SetCut("TOFMAX", tofmax); 
 
+    // Debug and log level
+    AliLog::SetGlobalDebugLevel(0);
+    AliLog::SetGlobalLogLevel(AliLog::kError);
 
-// Generator Configuration
-    gAlice->SetDebug(1);
+    // Generator Configuration
     AliGenerator* gener = GeneratorFactory(srun);
     gener->SetOrigin(0, 0, 0);    // vertex position
     gener->SetSigma(0, 0, 5.3);   // Sigma in (X,Y,Z) (cm) on IP position
@@ -202,6 +276,7 @@ void Config()
     
 // Field (L3 0.4 T)
     AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., smag);
+    field->SetL3ConstField(0); //Using const. field in the barrel
     rl->CdGAFile();
     gAlice->SetField(field);    
 //
@@ -374,19 +449,15 @@ void Config()
 
 
     if (iTOF) {
-       if (sgeo == kHoles) {
         //=================== TOF parameters ============================
-           AliTOF *TOF = new AliTOFv2FHoles("TOF", "TOF with Holes");
-       } else {
-           AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF");
-       }
+       AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF");
     }
 
 
     if (iRICH)
     {
         //=================== RICH parameters ===========================
-        AliRICH *RICH = new AliRICHv3("RICH", "normal RICH");
+        AliRICH *RICH = new AliRICHv1("RICH", "normal RICH");
 
     }
 
@@ -425,8 +496,13 @@ void Config()
     if (iMUON)
     {
         //=================== MUON parameters ===========================
-
+        // New MUONv1 version (geometry defined via builders)
         AliMUON *MUON = new AliMUONv1("MUON", "default");
+       ((AliMUONv1*)MUON)->SetStepManagerVersionDE(true);
+       MUON->AddGeometryBuilder(new AliMUONSt1GeometryBuilderV2(MUON));
+       MUON->AddGeometryBuilder(new AliMUONSt2GeometryBuilderV2(MUON));
+       MUON->AddGeometryBuilder(new AliMUONSlatGeometryBuilder(MUON));
+       MUON->AddGeometryBuilder(new AliMUONTriggerGeometryBuilder(MUON));
     }
     //=================== PHOS parameters ===========================
 
@@ -451,7 +527,7 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "G56_2_55_19");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH");
     }
 
      if (iCRT)
@@ -463,7 +539,7 @@ void Config()
      if (iVZERO)
     {
         //=================== CRT parameters ============================
-        AliVZERO *VZERO = new AliVZEROv2("VZERO", "normal VZERO");
+        AliVZERO *VZERO = new AliVZEROv5("VZERO", "normal VZERO");
     }
  
              
@@ -494,7 +570,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetThetaRange(thmin,thmax);
        gGener=gener;
       }
-       break;
+      break;
     case kParam_8000:
       {
        comment = comment.Append(":HIJINGparam N=8000");
@@ -507,7 +583,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetThetaRange(thmin,thmax);
        gGener=gener;
       }
-       break;
+      break;
     case kParam_4000:
       {
        comment = comment.Append("HIJINGparam N=4000");
@@ -533,7 +609,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetThetaRange(thmin,thmax);
        gGener=gener;
       }
-       break;
+      break;
 //
 //  Hijing Central
 //
@@ -545,7 +621,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetImpactParameterRange(0., 5.);
        gGener=gener;
       }
-       break;
+      break;
     case kHijing_cent2:
       {
        comment = comment.Append("HIJING cent2");
@@ -553,8 +629,8 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
 // impact parameter range
        gener->SetImpactParameterRange(0., 2.);
        gGener=gener;
-       break;
       }
+      break;
 //
 // Hijing Peripheral 
 //
@@ -566,7 +642,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetImpactParameterRange(5., 8.6);
        gGener=gener;
       }
-       break;
+      break;
     case kHijing_per2:
       {
        comment = comment.Append("HIJING per2");
@@ -575,7 +651,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetImpactParameterRange(8.6, 11.2);
        gGener=gener;
       }
-       break;
+      break;
     case kHijing_per3:
       {
        comment = comment.Append("HIJING per3");
@@ -584,7 +660,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetImpactParameterRange(11.2, 13.2);
        gGener=gener;
       }
-       break;
+      break;
     case kHijing_per4:
       {
        comment = comment.Append("HIJING per4");
@@ -593,7 +669,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetImpactParameterRange(13.2, 15.);
        gGener=gener;
       }
-       break;
+      break;
     case kHijing_per5:
       {
        comment = comment.Append("HIJING per5");
@@ -602,7 +678,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetImpactParameterRange(15., 100.);
        gGener=gener;
       }
-       break;
+      break;
 //
 //  Jet-Jet
 //
@@ -621,7 +697,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetJetPhiRange(75., 165.);   
        gGener=gener;
       }
-       break;
+      break;
 
     case kHijing_jj50:
       {
@@ -655,7 +731,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetJetPhiRange(75., 165.);   
        gGener=gener;
       }
-       break;
+      break;
 
     case kHijing_jj100:
       {
@@ -672,7 +748,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetJetPhiRange(75., 165.);   
        gGener=gener;
       }
-       break;
+      break;
 
     case kHijing_jj200:
       {
@@ -689,7 +765,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetJetPhiRange(75., 165.);   
        gGener=gener;
       }
-       break;
+      break;
 //
 // Gamma-Jet
 //
@@ -708,7 +784,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
         gener->SetJetPhiRange(220., 320.);
        gGener=gener;
       }
-       break;
+      break;
 
     case kHijing_gj50:
       {
@@ -725,7 +801,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
         gener->SetJetPhiRange(220., 320.);
        gGener=gener;
       }
-       break;
+      break;
 
     case kHijing_gj75:
       {
@@ -742,7 +818,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
         gener->SetJetPhiRange(220., 320.);
        gGener=gener;
       }
-       break;
+      break;
 
     case kHijing_gj100:
       {
@@ -759,7 +835,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
         gener->SetJetPhiRange(220., 320.);
        gGener=gener;
       }
-       break;
+      break;
 
     case kHijing_gj200:
       {
@@ -776,17 +852,13 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
         gener->SetJetPhiRange(220., 320.);
        gGener=gener;
       }
-       break;
+      break;
     case kHijing_pA:
       {
        comment = comment.Append("HIJING pA");
 
        AliGenCocktail *gener  = new AliGenCocktail();
-//     gener->SetTrackingFlag(0);
-       gener->SetOrigin(0, 0, 0);    // vertex position
-       gener->SetSigma(0, 0, 5.3);   // Sigma in (X,Y,Z) (cm) on IP position
-       gener->SetCutVertexZ(1.);     // Truncate at 1 sigma
-       gener->SetVertexSmear(kPerEvent); 
+
        AliGenHijing   *hijing = new AliGenHijing(-1);
 // centre of mass energy 
        hijing->SetEnergyCMS(TMath::Sqrt(82./208.) * 14000.);
@@ -817,23 +889,623 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->AddGenerator(gray,  "Gray Particles",1);
        gGener=gener;
       }
-       break;
+      break;
     case kPythia6:
       {
         comment = comment.Append(":Pythia p-p @ 14 TeV");
         AliGenPythia *gener = new AliGenPythia(-1); 
         gener->SetMomentumRange(0,999999);
-        gener->SetPhiRange(-180,180);
         gener->SetThetaRange(0., 180.);
         gener->SetYRange(-12,12);
         gener->SetPtRange(0,1000);
-        gener->SetStrucFunc(kCTEQ4L);   
         gener->SetProcess(kPyMb);
         gener->SetEnergyCMS(14000.);
        gGener=gener;
       }
+      break;
+    case kPythia6Jets20_24:
+      {
+        comment = comment.Append(":Pythia jets 20-24 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(20., 24.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kPythia6Jets24_29:
+      {
+        comment = comment.Append(":Pythia jets 24-29 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(24., 29.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kPythia6Jets29_35:
+      {
+        comment = comment.Append(":Pythia jets 29-35 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(29., 35.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kPythia6Jets35_42:
+      {
+        comment = comment.Append(":Pythia jets 35-42 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(35., 42.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kPythia6Jets42_50:
+      {
+        comment = comment.Append(":Pythia jets 42-50 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(42., 50.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kPythia6Jets50_60:
+      {
+        comment = comment.Append(":Pythia jets 50-60 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(50., 60.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kPythia6Jets60_72:
+      {
+        comment = comment.Append(":Pythia jets 60-72 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(60., 72.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kPythia6Jets72_86:
+      {
+        comment = comment.Append(":Pythia jets 72-86 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(72., 86.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kPythia6Jets86_104:
+      {
+        comment = comment.Append(":Pythia jets 86-104 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(86., 104.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kPythia6Jets104_125:
+      {
+        comment = comment.Append(":Pythia jets 105-125 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(104., 125.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kPythia6Jets125_150:
+      {
+        comment = comment.Append(":Pythia jets 125-150 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(125., 150.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kPythia6Jets150_180:
+      {
+        comment = comment.Append(":Pythia jets 150-180 GeV @ 5.5 TeV");
+        AliGenPythia * gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);//        Centre of mass energy
+       gener->SetProcess(kPyJets);//        Process type
+       gener->SetJetEtaRange(-0.5, 0.5);//  Final state kinematic cuts
+       gener->SetJetPhiRange(0., 360.);
+       gener->SetJetEtRange(10., 1000.);
+       gener->SetGluonRadiation(1,1);
+       //    gener->SetPtKick(0.);
+       //   Structure function
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(150., 180.);// Pt transfer of the hard scattering
+       gener->SetPycellParameters(2., 274, 432, 0., 4., 5., 1.0);
+       gener->SetForceDecay(kAll);//  Decay type (semielectronic, etc.)
+       gGener=gener;
+      }
+      break;
+    case kD0PbPb5500:
+      {
+       comment = comment.Append(" D0 in Pb-Pb at 5.5 TeV");
+       AliGenPythia * gener = new AliGenPythia(10);
+       gener->SetProcess(kPyD0PbPbMNR);
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(2.1,-1.0);
+       gener->SetEnergyCMS(5500.);
+       gener->SetNuclei(208,208);
+       gener->SetForceDecay(kHadronicD);
+       gener->SetYRange(-2,2);
+       gener->SetFeedDownHigherFamily(kFALSE);
+       gener->SetStackFillOpt(AliGenPythia::kParentSelection);
+       gener->SetCountMode(AliGenPythia::kCountParents);
+       gGener=gener;
+      }
+      break;
+    case kCharmSemiElPbPb5500:
+      {
+       comment = comment.Append(" Charm in Pb-Pb at 5.5 TeV");
+       AliGenPythia * gener = new AliGenPythia(10);
+       gener->SetProcess(kPyCharmPbPbMNR);
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(2.1,-1.0);
+       gener->SetEnergyCMS(5500.);
+       gener->SetNuclei(208,208);
+       gener->SetForceDecay(kSemiElectronic);
+       gener->SetYRange(-2,2);
+       gener->SetFeedDownHigherFamily(kFALSE);
+       gener->SetCountMode(AliGenPythia::kCountParents);
+       gGener=gener;
+      }
+      break;
+    case kBeautySemiElPbPb5500:
+      {
+       comment = comment.Append(" Beauty in Pb-Pb at 5.5 TeV");
+       AliGenPythia *gener = new AliGenPythia(10);
+       gener->SetProcess(kPyBeautyPbPbMNR);
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetPtHard(2.75,-1.0);
+       gener->SetEnergyCMS(5500.);
+       gener->SetNuclei(208,208);
+       gener->SetForceDecay(kSemiElectronic);
+       gener->SetYRange(-2,2);
+       gener->SetFeedDownHigherFamily(kFALSE);
+       gener->SetCountMode(AliGenPythia::kCountParents);
+       gGener=gener;
+      }
+      break;
+    case kCocktailTRD:
+      {
+       comment = comment.Append(" Cocktail for TRD at 5.5 TeV");
+       AliGenCocktail *gener  = new AliGenCocktail();
+       
+       AliGenParam *phi = new AliGenParam(10,
+                                           new AliGenMUONlib(),
+                                           AliGenMUONlib::kPhi,
+                                           "Vogt PbPb");
+
+       phi->SetPtRange(0, 100);
+       phi->SetYRange(-1., +1.);
+       phi->SetForceDecay(kDiElectron);
+
+       AliGenParam *omega = new AliGenParam(10,
+                                            new AliGenMUONlib(),
+                                            AliGenMUONlib::kOmega,
+                                            "Vogt PbPb");
+
+       omega->SetPtRange(0, 100);
+       omega->SetYRange(-1., +1.);
+       omega->SetForceDecay(kDiElectron);
+       
+       AliGenParam *jpsi = new AliGenParam(10,
+                                           new AliGenMUONlib(),
+                                           AliGenMUONlib::kJpsiFamily,
+                                           "Vogt PbPb");
+
+       jpsi->SetPtRange(0, 100);
+       jpsi->SetYRange(-1., +1.);
+       jpsi->SetForceDecay(kDiElectron);
+
+       AliGenParam *ups = new AliGenParam(10,
+                                          new AliGenMUONlib(),
+                                          AliGenMUONlib::kUpsilonFamily,
+                                          "Vogt PbPb");
+       ups->SetPtRange(0, 100);
+       ups->SetYRange(-1., +1.);
+       ups->SetForceDecay(kDiElectron);
+       
+       AliGenParam *charm = new AliGenParam(10,
+                                            new AliGenMUONlib(), 
+                                            AliGenMUONlib::kCharm,
+                                            "central");
+       charm->SetPtRange(0, 100);
+       charm->SetYRange(-1.5, +1.5);
+       charm->SetForceDecay(kSemiElectronic);
+       
+       
+       AliGenParam *beauty = new AliGenParam(10,
+                                             new AliGenMUONlib(), 
+                                             AliGenMUONlib::kBeauty,
+                                             "central");
+       beauty->SetPtRange(0, 100);
+       beauty->SetYRange(-1.5, +1.5);
+       beauty->SetForceDecay(kSemiElectronic);
+
+       AliGenParam *beautyJ = new AliGenParam(10,
+                                              new AliGenMUONlib(), 
+                                              AliGenMUONlib::kBeauty,
+                                              "central");
+       beautyJ->SetPtRange(0, 100);
+       beautyJ->SetYRange(-1.5, +1.5);
+       beautyJ->SetForceDecay(kBJpsiDiElectron);
+
+       gener->AddGenerator(phi,"Phi",1);
+       gener->AddGenerator(omega,"Omega",1);
+       gener->AddGenerator(jpsi,"J/psi",1);
+       gener->AddGenerator(ups,"Upsilon",1);
+       gener->AddGenerator(charm,"Charm",1);
+       gener->AddGenerator(beauty,"Beauty",1);
+       gener->AddGenerator(beautyJ,"J/Psi from Beauty",1);
+       gGener=gener;
+      }
+      break;
+    case kPyJJ:
+      {
+       comment = comment.Append(" Jet-jet at 5.5 TeV");
+       AliGenPythia *gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);
+       gener->SetProcess(kPyJets);
+       Double_t ptHardMin=10.0, ptHardMax=-1.0;
+       gener->SetPtHard(ptHardMin,ptHardMax);
+       gener->SetYHard(-0.7,0.7);
+       gener->SetJetEtaRange(-0.2,0.2);
+       gener->SetEventListRange(0,1);
+       gGener=gener;
+      }
+      break;
+    case kPyGJ:
+      {
+       comment = comment.Append(" Gamma-jet at 5.5 TeV");
+       AliGenPythia *gener = new AliGenPythia(-1);
+       gener->SetEnergyCMS(5500.);
+       gener->SetProcess(kPyDirectGamma);
+       Double_t ptHardMin=10.0, ptHardMax=-1.0;
+       gener->SetPtHard(ptHardMin,ptHardMax);
+       gener->SetYHard(-1.0,1.0);
+       gener->SetGammaEtaRange(-0.13,0.13);
+       gener->SetGammaPhiRange(210.,330.);
+       gener->SetEventListRange(0,1);
+       gGener=gener;
+      }
+      break;
+    case kMuonCocktailCent1:
+      {
+       comment = comment.Append(" Muon Cocktail Cent1");
+       AliGenMUONCocktail * gener = new AliGenMUONCocktail();
+       gener->SetPtRange(0.4,100.);       // Transverse momentum range   
+       gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
+       gener->SetYRange(-4.0,-2.4);
+       gener->SetMuonPtCut(0.8);
+       gener->SetMuonThetaCut(171.,178.);
+       gener->SetMuonMultiplicity(2);
+       gener->SetImpactParameterRange(12.,16.);  //Centrality class Cent1 for PDC04
+       gGener=gener;
+      }
+      break;
+    case kMuonCocktailPer1:
+      {
+       comment = comment.Append(" Muon Cocktail Per1");
+       AliGenMUONCocktail * gener = new AliGenMUONCocktail();
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
+       gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
+       gener->SetYRange(-4.0,-2.4);
+       gener->SetMuonPtCut(0.8);
+       gener->SetMuonThetaCut(171.,178.);
+       gener->SetMuonMultiplicity(2);
+       gener->SetImpactParameterRange(5.,8.6);//Centrality class Per1 for PDC04
+       gGener=gener;
+      }
+      break;
+    case kMuonCocktailPer4:
+      {
+       comment = comment.Append(" Muon Cocktail Per4");
+       AliGenMUONCocktail * gener = new AliGenMUONCocktail();
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
+       gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
+       gener->SetYRange(-4.0,-2.4);
+       gener->SetMuonPtCut(0.8);
+       gener->SetMuonThetaCut(171.,178.);
+       gener->SetMuonMultiplicity(2);
+       gener->SetImpactParameterRange(13.2,15.0);//Centrality class Per4 for PDC04
+       gGener=gener;
+      }
+      break;
+    case kMuonCocktailCent1HighPt:
+      {
+       comment = comment.Append(" Muon Cocktail HighPt Cent1");
+       AliGenMUONCocktail * gener = new AliGenMUONCocktail();
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
+       gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
+       gener->SetYRange(-4.0,-2.4);
+       gener->SetMuonPtCut(2.5);
+       gener->SetMuonThetaCut(171.,178.);
+       gener->SetMuonMultiplicity(2);
+       gener->SetImpactParameterRange(0.,5.);  //Centrality class Cent1 for PDC04
+       gGener=gener;
+      }
+      break;
+    case kMuonCocktailPer1HighPt :
+      {
+       comment = comment.Append(" Muon Cocktail HighPt Per1");
+       AliGenMUONCocktail * gener = new AliGenMUONCocktail();
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
+       gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
+       gener->SetYRange(-4.0,-2.4);
+       gener->SetMuonPtCut(2.5);
+       gener->SetMuonThetaCut(171.,178.);
+       gener->SetMuonMultiplicity(2);
+       gener->SetImpactParameterRange(5.,8.6);//Centrality class Per1 for PDC04
+       gGener=gener;
+      }
+      break;
+    case kMuonCocktailPer4HighPt:
+      {
+       comment = comment.Append(" Muon Cocktail HighPt Per4");
+       AliGenMUONCocktail * gener = new AliGenMUONCocktail();
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
+       gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
+       gener->SetYRange(-4.0,-2.4);
+       gener->SetMuonPtCut(2.5);
+       gener->SetMuonThetaCut(171.,178.);
+       gener->SetMuonMultiplicity(2);
+       gener->SetImpactParameterRange(13.2,15.0);//Centrality class Per4 for PDC04
+       gGener=gener;
+      }
+      break;
+    case kMuonCocktailCent1Single:
+      {
+       comment = comment.Append(" Muon Cocktail Single Cent1");
+       AliGenMUONCocktail * gener = new AliGenMUONCocktail();
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
+       gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
+       gener->SetYRange(-4.0,-2.4);
+       gener->SetMuonPtCut(0.8);
+       gener->SetMuonThetaCut(171.,178.);
+       gener->SetMuonMultiplicity(1);
+       gener->SetImpactParameterRange(0.,5.);  //Centrality class Cent1 for PDC04
+       gGener=gener;
+      }
+      break;
+    case kMuonCocktailPer1Single :
+      {
+       comment = comment.Append(" Muon Cocktail Single Per1");
+       AliGenMUONCocktail * gener = new AliGenMUONCocktail();
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
+       gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
+       gener->SetYRange(-4.0,-2.4);
+       gener->SetMuonPtCut(0.8);
+       gener->SetMuonThetaCut(171.,178.);
+       gener->SetMuonMultiplicity(1);
+       gener->SetImpactParameterRange(5.,8.6);//Centrality class Per1 for PDC04
+       gener->SetNumberOfParticipants(229.3);//Centrality class Per1 for PDC04
+       gGener=gener;
+      }
+      break;
+    case kMuonCocktailPer4Single:
+      {
+       comment = comment.Append(" Muon Cocktail Single Per4");
+       AliGenMUONCocktail * gener = new AliGenMUONCocktail();
+       gener->SetPtRange(0.0,100.);       // Transverse momentum range   
+       gener->SetPhiRange(0.,360.);    // Azimuthal angle range  
+       gener->SetYRange(-4.0,-2.4);
+       gener->SetMuonPtCut(0.8);
+       gener->SetMuonThetaCut(171.,178.);
+       gener->SetMuonMultiplicity(1);
+       gener->SetImpactParameterRange(13.2,15.0);//Centrality class Per4 for PDC04
+       gGener=gener;
+      }
+      break;
+    case kFlow_2_2000:
+    {
+       comment = comment.Append(" Flow with dN/deta  = 2000, vn = 2%");
+       gGener = GeVSimStandard(2000., 2.);
+    }
+    break;
+    
+    case kFlow_10_2000:
+    {
+       comment = comment.Append(" Flow with dN/deta  = 2000, vn = 10%");
+       gGener = GeVSimStandard(2000., 10.);
+    }
+    break;
+    
+    case kFlow_6_2000:
+    {
+       comment = comment.Append(" Flow with dN/deta  = 2000, vn = 6%");
+       gGener = GeVSimStandard(2000., 6.);
+    }
     break;
+    
+    case kFlow_6_5000:
+    {
+       comment = comment.Append(" Flow with dN/deta  = 5000, vn = 6%");
+       gGener = GeVSimStandard(5000., 6.);
     }
+    break;
+    case kHIJINGplus:
+    {
+       //
+       // The cocktail
+       AliGenCocktail *gener  = new AliGenCocktail();
+
+       //
+       // Charm production by Pythia
+       AliGenPythia * genpyc = new AliGenPythia(230);
+       genpyc->SetProcess(kPyCharmPbPbMNR);
+       genpyc->SetStrucFunc(kCTEQ4L);
+       genpyc->SetPtHard(2.1,-1.0);
+       genpyc->SetEnergyCMS(5500.);
+       genpyc->SetNuclei(208,208);
+       genpyc->SetYRange(-999,999);
+       genpyc->SetForceDecay(kAll);
+       genpyc->SetFeedDownHigherFamily(kFALSE);
+       genpyc->SetCountMode(AliGenPythia::kCountParents);
+       //
+       // Beauty production by Pythia
+       AliGenPythia * genpyb = new AliGenPythia(9);
+       genpyb->SetProcess(kPyBeautyPbPbMNR);
+       genpyb->SetStrucFunc(kCTEQ4L);
+       genpyb->SetPtHard(2.75,-1.0);
+       genpyb->SetEnergyCMS(5500.);
+       genpyb->SetNuclei(208,208);
+       genpyb->SetYRange(-999,999);
+       genpyb->SetForceDecay(kAll);
+       genpyb->SetFeedDownHigherFamily(kFALSE);
+       genpyb->SetCountMode(AliGenPythia::kCountParents);
+        //
+        // Hyperons
+       //
+       AliGenSTRANGElib *lib = new AliGenSTRANGElib();
+       Int_t particle;
+       // Xi
+       particle = AliGenSTRANGElib::kXiMinus;
+       AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
+       genXi->SetPtRange(0., 12.);
+       genXi->SetYRange(-1.1, 1.1);
+       genXi->SetForceDecay(kNoDecay); 
+       //
+       // Omega
+       particle = AliGenSTRANGElib::kOmegaMinus;
+       AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
+       genOmega->SetPtRange(0, 12.);
+       genOmega->SetYRange(-1.1, 1.1);
+       genOmega->SetForceDecay(kNoDecay);
+       
+       //
+       // Central Hijing 
+       AliGenHijing *genHi = HijingStandard();
+       genHi->SwitchOffHeavyQuarks(kTRUE);
+       genHi->SetImpactParameterRange(0.,5.);
+        //
+       // Add everything to the cocktail and shake ...
+       gener->AddGenerator(genHi,    "Hijing cent1", 1);
+       gener->AddGenerator(genpyc,   "Extra charm",  1);
+       gener->AddGenerator(genpyb,   "Extra beauty", 1);
+       gener->AddGenerator(genXi,    "Xi"          , 1);
+       gener->AddGenerator(genOmega, "Omega",        1);
+       gGener = gener;
+    }
+    break;
+    default: break;
+    }
+    
     return gGener;
 }
 
@@ -850,7 +1522,7 @@ AliGenHijing* HijingStandard()
 // tell hijing to keep the full parent child chain
      gener->KeepFullEvent();
 // enable jet quenching
-     gener->SetJetQuenching(4);
+     gener->SetJetQuenching(1);
 // enable shadowing
      gener->SetShadowing(1);
 // neutral pion and heavy particle decays switched off
@@ -862,5 +1534,113 @@ AliGenHijing* HijingStandard()
      return gener;
 }
 
+AliGenGeVSim* GeVSimStandard(Float_t mult, Float_t vn)
+{
+    AliGenGeVSim* gener = new AliGenGeVSim(0);
+//
+// Mult is the number of charged particles in |eta| < 0.5
+// Vn is in (%)
+//
+// Sigma of the Gaussian dN/deta
+    Float_t sigma_eta  = 2.75;
+//
+// Maximum eta
+    Float_t etamax     = 7.00;
+//
+//
+// Scale from multiplicity in |eta| < 0.5 to |eta| < |etamax|  
+    Float_t mm = mult * (TMath::Erf(etamax/sigma_eta/sqrt(2.)) / TMath::Erf(0.5/sigma_eta/sqrt(2.))); 
+//
+// Scale from charged to total multiplicity
+// 
+    mm *= 1.587;
+//
+// Vn 
+    vn /= 100.;         
+//
+// Define particles
+//
+//
+// 78% Pions (26% pi+, 26% pi-, 26% p0)              T = 250 MeV
+    AliGeVSimParticle *pp =  new AliGeVSimParticle(kPiPlus,  1, 0.26 * mm, 0.25, sigma_eta) ;
+    AliGeVSimParticle *pm =  new AliGeVSimParticle(kPiMinus, 1, 0.26 * mm, 0.25, sigma_eta) ;
+    AliGeVSimParticle *p0 =  new AliGeVSimParticle(kPi0,     1, 0.26 * mm, 0.25, sigma_eta) ;
+//
+// 12% Kaons (3% K0short, 3% K0long, 3% K+, 3% K-)   T = 300 MeV
+    AliGeVSimParticle *ks =  new AliGeVSimParticle(kK0Short, 1, 0.03 * mm, 0.30, sigma_eta) ;
+    AliGeVSimParticle *kl =  new AliGeVSimParticle(kK0Long,  1, 0.03 * mm, 0.30, sigma_eta) ;
+    AliGeVSimParticle *kp =  new AliGeVSimParticle(kKPlus,   1, 0.03 * mm, 0.30, sigma_eta) ;
+    AliGeVSimParticle *km =  new AliGeVSimParticle(kKMinus,  1, 0.03 * mm, 0.30, sigma_eta) ;
+//
+// 10% Protons / Neutrons (5% Protons, 5% Neutrons)  T = 250 MeV
+    AliGeVSimParticle *pr =  new AliGeVSimParticle(kProton,  1, 0.05 * mm, 0.25, sigma_eta) ;
+    AliGeVSimParticle *ne =  new AliGeVSimParticle(kNeutron, 1, 0.05 * mm, 0.25, sigma_eta) ;
+//
+// Set Elliptic Flow properties        
+
+    Float_t pTsaturation = 2. ;
+
+    pp->SetEllipticParam(vn,pTsaturation,0.) ;
+    pm->SetEllipticParam(vn,pTsaturation,0.) ;
+    p0->SetEllipticParam(vn,pTsaturation,0.) ;
+    pr->SetEllipticParam(vn,pTsaturation,0.) ;
+    ne->SetEllipticParam(vn,pTsaturation,0.) ;
+    ks->SetEllipticParam(vn,pTsaturation,0.) ;
+    kl->SetEllipticParam(vn,pTsaturation,0.) ;
+    kp->SetEllipticParam(vn,pTsaturation,0.) ;
+    km->SetEllipticParam(vn,pTsaturation,0.) ;
+//
+// Set Direct Flow properties  
+    pp->SetDirectedParam(vn,1.0,0.) ;
+    pm->SetDirectedParam(vn,1.0,0.) ;
+    p0->SetDirectedParam(vn,1.0,0.) ;
+    pr->SetDirectedParam(vn,1.0,0.) ;
+    ne->SetDirectedParam(vn,1.0,0.) ;
+    ks->SetDirectedParam(vn,1.0,0.) ;
+    kl->SetDirectedParam(vn,1.0,0.) ;
+    kp->SetDirectedParam(vn,1.0,0.) ;
+    km->SetDirectedParam(vn,1.0,0.) ;
+//
+// Add particles to the list
+    gener->AddParticleType(pp) ;
+    gener->AddParticleType(pm) ;
+    gener->AddParticleType(p0) ;
+    gener->AddParticleType(pr) ;
+    gener->AddParticleType(ne) ;
+    gener->AddParticleType(ks) ;
+    gener->AddParticleType(kl) ;
+    gener->AddParticleType(kp) ;
+    gener->AddParticleType(km) ;
+//     
+// Random Ev.Plane ----------------------------------
+    TF1 *rpa = new TF1("gevsimPsiRndm","1", 0, 360);
+// --------------------------------------------------
+    gener->SetPtRange(0., 9.) ; // Use a resonable range! (used for bin size in numerical integration)
+    gener->SetPhiRange(0, 360);
+    //
+    // Set pseudorapidity range 
+    Float_t thmin = EtaToTheta(+etamax);   
+    Float_t thmax = EtaToTheta(-etamax);   
+    gener->SetThetaRange(thmin,thmax);     
+    return gener;
+}
+
 
 
+void ProcessEnvironmentVars()
+{
+    // Run type
+    if (gSystem->Getenv("CONFIG_RUN_TYPE")) {
+      for (Int_t iRun = 0; iRun < kRunMax; iRun++) {
+       if (strcmp(gSystem->Getenv("CONFIG_RUN_TYPE"), pprRunName[iRun])==0) {
+         srun = (PprRun_t)iRun;
+         cout<<"Run type set to "<<pprRunName[iRun]<<endl;
+       }
+      }
+    }
+
+    // Random Number seed
+    if (gSystem->Getenv("CONFIG_SEED")) {
+      sseed = atoi(gSystem->Getenv("CONFIG_SEED"));
+    }
+}