]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - macros/ConfigPPR.C
Using the default ITS settings in the configuration files (Bjorn)
[u/mrichter/AliRoot.git] / macros / ConfigPPR.C
index d2cd9e85d5fc8b4e61cc16cee988f733b1d3713f..807f8a4d2556ecf8fde431615d9f53b08ffe7fdc 100644 (file)
@@ -1,13 +1,22 @@
+// 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/AliGenSlowNucleons.h"
 #include "EVGEN/AliSlowNucleonModelExp.h"
 #include "EVGEN/AliGenParam.h"
-#include "EVGEN/AliGenGSIlib.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/AliMAG.h"
-#include "STRUCT/AliABSOv0.h"
-#include "STRUCT/AliDIPOv2.h"
-#include "STRUCT/AliHALL.h"
+#include "STRUCT/AliABSOv3.h"
+#include "STRUCT/AliDIPOv3.h"
+#include "STRUCT/AliHALLv3.h"
 #include "STRUCT/AliFRAMEv2.h"
-#include "STRUCT/AliSHILv2.h"
-#include "STRUCT/AliPIPEv0.h"
+#include "STRUCT/AliSHILv3.h"
+#include "STRUCT/AliPIPEv3.h"
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
-#include "TOF/AliTOFv4T0.h"
-#include "RICH/AliRICHv1.h"
+#include "TOF/AliTOFv6T0.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
-#include "MUON/AliMUONSt1GeometryBuilder.h"
-#include "MUON/AliMUONSt2GeometryBuilder.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 "CRT/AliCRTv0.h"
-#include "VZERO/AliVZEROv3.h"
+#include "T0/AliT0v1.h"
+#include "EMCAL/AliEMCALv2.h"
+#include "ACORDE/AliACORDEv0.h"
+#include "VZERO/AliVZEROv7.h"
 #endif
 
 enum PprRun_t 
@@ -54,13 +64,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, kPythia6Jets, kD0PbPb5500, kD_TRD, kB_TRD, kJpsi_TRD,
-    kU_TRD, kPyJJ, kPyGJ
+    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
 };
 
-enum PprGeo_t 
-{
-    kHoles, kNoHoles
+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 PprRad_t
@@ -73,13 +110,23 @@ enum PprMag_t
     k2kG, k4kG, k5kG
 };
 
+enum PprTrigConf_t
+{
+    kDefaultPPTrig, kDefaultPbPbTrig
+};
+
+const char * pprTrigConfName[] = {
+    "p-p","Pb-Pb"
+};
 
 // 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 PprRad_t srad = kGluonRadiation;
 static PprMag_t smag = k5kG;
+static Int_t    sseed = 12345; //Set 0 to use the current time
+//static PprTrigConf_t strig = kDefaultPPTrig; // default pp trigger configuration
+static PprTrigConf_t strig = kDefaultPbPbTrig; // default PbPb trigger configuration
 
 // Comment line 
 static TString  comment;
@@ -88,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; 
 
 
@@ -104,13 +156,19 @@ void Config()
     gSystem->Load("libgeant321");
 #endif
 
-    new     TGeant3("C++ Interface to Geant3");
+    new     TGeant3TGeo("C++ Interface to Geant3");
+
+    if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetRun(0);
+    }
 
     AliRunLoader* rl=0x0;
 
-    cout<<"Config.C: Creating Run Loader ..."<<endl;
+    AliLog::Message(AliLog::kInfo, "Creating Run Loader", "", "", "Config()"," ConfigPPR.C", __LINE__);
+
     rl = AliRunLoader::Open("galice.root",
-                           AliConfig::fgkDefaultEventFolderName,
+                           AliConfig::GetDefaultEventFolderName(),
                            "recreate");
     if (rl == 0x0)
       {
@@ -120,12 +178,32 @@ void Config()
     rl->SetCompressionLevel(2);
     rl->SetNumberOfEventsPerFile(3);
     gAlice->SetRunLoader(rl);
+    // gAlice->SetGeometryFromFile("geometry.root");
+    // gAlice->SetGeometryFromCDB();
+
+    // Set the trigger configuration
+    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //
     // 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);
     //
@@ -167,9 +245,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(0);
+    // 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
@@ -195,14 +275,6 @@ void Config()
        comment = comment.Append(" | Gluon Radiation Off");
     }
 
-    if (sgeo == kHoles)
-    {
-       comment = comment.Append(" | Holes for PHOS/RICH");
-       
-    } else {
-       comment = comment.Append(" | No holes for PHOS/RICH");
-    }
-
     printf("\n \n Comment: %s \n \n", comment.Data());
     
     
@@ -223,16 +295,16 @@ void Config()
     Int_t   iPHOS   = 1;
     Int_t   iPIPE   = 1;
     Int_t   iPMD    = 1;
-    Int_t   iRICH   = 1;
+    Int_t   iHMPID   = 1;
     Int_t   iSHIL   = 1;
-    Int_t   iSTART  = 1;
+    Int_t   iT0  = 1;
     Int_t   iTOF    = 1;
     Int_t   iTPC    = 1;
     Int_t   iTRD    = 1;
     Int_t   iZDC    = 1;
     Int_t   iEMCAL  = 1;
     Int_t   iVZERO  = 1;
-    Int_t   iCRT    = 0;
+    Int_t   iACORDE    = 0;
 
     //=================== Alice BODY parameters =============================
     AliBODY *BODY = new AliBODY("BODY", "Alice envelop");
@@ -250,21 +322,21 @@ void Config()
     if (iABSO)
     {
         //=================== ABSO parameters ============================
-        AliABSO *ABSO = new AliABSOv0("ABSO", "Muon Absorber");
+        AliABSO *ABSO = new AliABSOv3("ABSO", "Muon Absorber");
     }
 
     if (iDIPO)
     {
         //=================== DIPO parameters ============================
 
-        AliDIPO *DIPO = new AliDIPOv2("DIPO", "Dipole version 2");
+        AliDIPO *DIPO = new AliDIPOv3("DIPO", "Dipole version 3");
     }
 
     if (iHALL)
     {
         //=================== HALL parameters ============================
 
-        AliHALL *HALL = new AliHALL("HALL", "Alice Hall");
+        AliHALL *HALL = new AliHALLv3("HALL", "Alice Hall");
     }
 
 
@@ -273,18 +345,13 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-       if (sgeo == kHoles) {
-           FRAME->SetHoles(1);
-       } else {
-           FRAME->SetHoles(0);
-       }
     }
 
     if (iSHIL)
     {
         //=================== SHIL parameters ============================
 
-        AliSHIL *SHIL = new AliSHILv2("SHIL", "Shielding Version 2");
+        AliSHIL *SHIL = new AliSHILv3("SHIL", "Shielding Version 3");
     }
 
 
@@ -292,104 +359,33 @@ void Config()
     {
         //=================== PIPE parameters ============================
 
-        AliPIPE *PIPE = new AliPIPEv0("PIPE", "Beam Pipe");
+        AliPIPE *PIPE = new AliPIPEv3("PIPE", "Beam Pipe");
     }
  
-    if(iITS) {
+    if (iITS)
+    {
+       //=================== ITS parameters ============================
 
-    //=================== ITS parameters ============================
-    //
-    // As the innermost detector in ALICE, the Inner Tracking System "impacts" on
-    // almost all other detectors. This involves the fact that the ITS geometry
-    // still has several options to be followed in parallel in order to determine
-    // the best set-up which minimizes the induced background. All the geometries
-    // available to date are described in the following. Read carefully the comments
-    // and use the default version (the only one uncommented) unless you are making
-    // comparisons and you know what you are doing. In this case just uncomment the
-    // ITS geometry you want to use and run Aliroot.
-    //
-    // Detailed geometries:         
-    //
-    //
-    //AliITS *ITS  = new AliITSv5symm("ITS","Updated ITS TDR detailed version with symmetric services");
-    //
-    //AliITS *ITS  = new AliITSv5asymm("ITS","Updates ITS TDR detailed version with asymmetric services");
-    //
        AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
-       ITS->SetMinorVersion(2);  // don't touch this parameter if you're not an ITS developer
-       ITS->SetReadDet(kTRUE);   // don't touch this parameter if you're not an ITS developer
-    //    ITS->SetWriteDet("$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.det");  // don't touch this parameter if you're not an ITS developer
-       ITS->SetThicknessDet1(200.);   // detector thickness on layer 1 must be in the range [100,300]
-       ITS->SetThicknessDet2(200.);   // detector thickness on layer 2 must be in the range [100,300]
-       ITS->SetThicknessChip1(200.);  // chip thickness on layer 1 must be in the range [150,300]
-       ITS->SetThicknessChip2(200.);  // chip thickness on layer 2 must be in the range [150,300]
-       ITS->SetRails(0);            // 1 --> rails in ; 0 --> rails out
-       ITS->SetCoolingFluid(1);   // 1 --> water ; 0 --> freon
-
-    // Coarse geometries (warning: no hits are produced with these coarse geometries and they unuseful 
-    // for reconstruction !):
-    //                                                     
-    //
-    //AliITSvPPRcoarseasymm *ITS  = new AliITSvPPRcoarseasymm("ITS","New ITS PPR coarse version with asymmetric services");
-    //ITS->SetRails(0);                // 1 --> rails in ; 0 --> rails out
-    //ITS->SetSupportMaterial(0);      // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon
-    //
-    //AliITS *ITS  = new AliITSvPPRcoarsesymm("ITS","New ITS PPR coarse version with symmetric services");
-    //ITS->SetRails(0);                // 1 --> rails in ; 0 --> rails out
-    //ITS->SetSupportMaterial(0);      // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon
-    //                      
-    //
-    //
-    // Geant3 <-> EUCLID conversion
-    // ============================
-    //
-    // SetEUCLID is a flag to output (=1) or not to output (=0) both geometry and
-    // media to two ASCII files (called by default ITSgeometry.euc and
-    // ITSgeometry.tme) in a format understandable to the CAD system EUCLID.
-    // The default (=0) means that you dont want to use this facility.
-    //
-       ITS->SetEUCLID(0);  
     }
 
     if (iTPC)
     {
-        //============================ TPC parameters ================================
-        // --- This allows the user to specify sectors for the SLOW (TPC geometry 2)
-        // --- Simulator. SecAL (SecAU) <0 means that ALL lower (upper)
-        // --- sectors are specified, any value other than that requires at least one 
-        // --- sector (lower or upper)to be specified!
-        // --- Reminder: sectors 1-24 are lower sectors (1-12 -> z>0, 13-24 -> z<0)
-        // ---           sectors 25-72 are the upper ones (25-48 -> z>0, 49-72 -> z<0)
-        // --- SecLows - number of lower sectors specified (up to 6)
-        // --- SecUps - number of upper sectors specified (up to 12)
-        // --- Sens - sensitive strips for the Slow Simulator !!!
-        // --- This does NOT work if all S or L-sectors are specified, i.e.
-        // --- if SecAL or SecAU < 0
-        //
-        //
-        //-----------------------------------------------------------------------------
-
-        //  gROOT->LoadMacro("SetTPCParam.C");
-        //  AliTPCParam *param = SetTPCParam();
+      //============================ TPC parameters =====================
         AliTPC *TPC = new AliTPCv2("TPC", "Default");
-
-        // All sectors included 
-        TPC->SetSecAL(-1);
-        TPC->SetSecAU(-1);
-
     }
 
 
     if (iTOF) {
         //=================== TOF parameters ============================
-       AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF");
+       AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF");
     }
 
 
-    if (iRICH)
+    if (iHMPID)
     {
-        //=================== RICH parameters ===========================
-        AliRICH *RICH = new AliRICHv1("RICH", "normal RICH");
+        //=================== HMPID parameters ===========================
+        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
 
     }
 
@@ -406,17 +402,6 @@ void Config()
         //=================== TRD parameters ============================
 
         AliTRD *TRD = new AliTRDv1("TRD", "TRD slow simulator");
-
-        // Select the gas mixture (0: 97% Xe + 3% isobutane, 1: 90% Xe + 10% CO2)
-        TRD->SetGasMix(1);
-       if (sgeo == kHoles) {
-           // With hole in front of PHOS
-           TRD->SetPHOShole();
-           // With hole in front of RICH
-           TRD->SetRICHhole();
-       }
-           // Switch on TR
-           AliTRDsim *TRDsim = TRD->CreateTR();
     }
 
     if (iFMD)
@@ -428,12 +413,8 @@ void Config()
     if (iMUON)
     {
         //=================== MUON parameters ===========================
-
+        // New MUONv1 version (geometry defined via builders)
         AliMUON *MUON = new AliMUONv1("MUON", "default");
-       MUON->AddGeometryBuilder(new AliMUONSt1GeometryBuilder(MUON));
-       MUON->AddGeometryBuilder(new AliMUONSt2GeometryBuilder(MUON));
-       MUON->AddGeometryBuilder(new AliMUONSlatGeometryBuilder(MUON));
-       MUON->AddGeometryBuilder(new AliMUONTriggerGeometryBuilder(MUON));
     }
     //=================== PHOS parameters ===========================
 
@@ -449,28 +430,28 @@ void Config()
         AliPMD *PMD = new AliPMDv1("PMD", "normal PMD");
     }
 
-    if (iSTART)
+    if (iT0)
     {
-        //=================== START parameters ============================
-        AliSTART *START = new AliSTARTv1("START", "START Detector");
+        //=================== T0 parameters ============================
+        AliT0 *T0 = new AliT0v1("T0", "T0 Detector");
     }
 
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCAL_55_25");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
     }
 
-     if (iCRT)
+     if (iACORDE)
     {
-        //=================== CRT parameters ============================
-        AliCRT *CRT = new AliCRTv0("CRT", "normal ACORDE");
+        //=================== ACORDE parameters ============================
+        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
     {
-        //=================== CRT parameters ============================
-        AliVZERO *VZERO = new AliVZEROv3("VZERO", "normal VZERO");
+        //=================== VZERO parameters ============================
+        AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO");
     }
  
              
@@ -826,19 +807,169 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
         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 kPythia6Jets:
+    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 @ 5.5 TeV");
+        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
@@ -855,6 +986,63 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        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");
@@ -864,56 +1052,118 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetPtHard(2.1,-1.0);
        gener->SetEnergyCMS(5500.);
        gener->SetNuclei(208,208);
-       gGener=gener;
+       gener->SetForceDecay(kHadronicD);
+       gener->SetYRange(-2,2);
+       gener->SetFeedDownHigherFamily(kFALSE);
+       gener->SetStackFillOpt(AliGenPythia::kParentSelection);
+       gener->SetCountMode(AliGenPythia::kCountParents);
+       gGener=gener;
       }
       break;
-    case kD_TRD:
+    case kCharmSemiElPbPb5500:
       {
-       comment = comment.Append(" D0 for TRD at 5.5 TeV");
-       AliGenPythia *gener = new AliGenPythia(1);
-       gener->SetCutOnChild(0);
+       comment = comment.Append(" Charm in Pb-Pb at 5.5 TeV");
+       AliGenPythia * gener = new AliGenPythia(10);
+       gener->SetProcess(kPyCharmPbPbMNR);
        gener->SetStrucFunc(kCTEQ4L);
-       gener->SetProcess(kPyCharm);
-       gener->SetPtHard(0.,-1);
+       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 kB_TRD:
+    case kBeautySemiElPbPb5500:
       {
-       comment = comment.Append(" B for TRD at 5.5 TeV");
-       AliGenPythia *gener = new AliGenPythia(1);
-       gener->SetCutOnChild(0);
+       comment = comment.Append(" Beauty in Pb-Pb at 5.5 TeV");
+       AliGenPythia *gener = new AliGenPythia(10);
+       gener->SetProcess(kPyBeautyPbPbMNR);
        gener->SetStrucFunc(kCTEQ4L);
-       gener->SetProcess(kPyBeauty);
-       gener->SetPtHard(0.,-1);
+       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 kJpsi_TRD:
-      {
-       comment = comment.Append(" J/psi for TRD at 5.5 TeV");
-       AliGenParam *gener = new AliGenParam(1,new AliGenGSIlib(),
-                                            AliGenGSIlib::kJPsi,"MUON");
-       gener->SetMomentumRange(0,999);
-       gener->SetPtRange(0,30.);
-       gener->SetPhiRange(0., 360.);
-       gener->SetYRange(-0.9,+0.9);
-       gener->SetForceDecay(kDiElectron);
-       gGener=gener;
-      }
-      break;
-    case kU_TRD:
+    case kCocktailTRD:
       {
-       comment = comment.Append(" Upsilon for TRD at 5.5 TeV");
-       AliGenParam *gener = new AliGenParam(1,new AliGenGSIlib(),
-                                            AliGenGSIlib::kUpsilon,"RITMAN");
-       gener->SetMomentumRange(0,999);
-       gener->SetPtRange(0,30.);
-       gener->SetPhiRange(0., 360.);
-       gener->SetYRange(-0.9,0.9);
-       gener->SetForceDecay(kDiElectron);
+       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;
@@ -946,7 +1196,228 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        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(0.,5.);  //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;
 }
 
@@ -975,5 +1446,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"));
+    }
+}