]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - macros/ConfigPPR.C
Adding all jet cases. Returning to VZERO v2
[u/mrichter/AliRoot.git] / macros / ConfigPPR.C
index b87c6cc9c945fb167bd060c4c14fb2f30e34f50d..5802d86500169871b5f53e800bb8f488484e2a3e 100644 (file)
@@ -1,3 +1,57 @@
+// 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 "STEER/AliRunLoader.h"
+#include "STEER/AliRun.h"
+#include "STEER/AliConfig.h"
+#include "STEER/AliGenerator.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/AliGenGSIlib.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/AliFRAMEv2.h"
+#include "STRUCT/AliSHILv2.h"
+#include "STRUCT/AliPIPEv0.h"
+#include "ITS/AliITSvPPRasymmFMD.h"
+#include "TPC/AliTPCv2.h"
+#include "TOF/AliTOFv4T0.h"
+#include "RICH/AliRICHv1.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/AliVZEROv2.h"
+#endif
+
 enum PprRun_t 
 {
     test50,
@@ -6,7 +60,32 @@ 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
+    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, kD_TRD, kB_TRD, kJpsi_TRD,
+    kU_TRD, kPyJJ, kPyGJ, kRunMax
+};
+
+const char* pprRunName[kRunMax] = {
+    "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", "kD_TRD", 
+    "kB_TRD", "kJpsi_TRD",
+    "kU_TRD", "kPyJJ", "kPyGJ"
 };
 
 enum PprGeo_t 
@@ -26,41 +105,56 @@ enum PprMag_t
 
 
 // This part for configuration    
-static PprRun_t run = test50;
-static PprGeo_t geo = kHoles;
-static PprRad_t rad = kGluonRadiation;
-static PprMag_t mag = k4kG;
+//static PprRun_t srun = test50;
+static PprRun_t srun = kPythia6;
+static PprGeo_t sgeo = kHoles;
+static PprRad_t srad = kGluonRadiation;
+static PprMag_t smag = k5kG;
+static Int_t    sseed = 12345; //Set 0 to use the current time
 
 // Comment line 
 static TString  comment;
 
-
+// Functions
+Float_t EtaToTheta(Float_t arg);
+AliGenerator* GeneratorFactory(PprRun_t srun);
+AliGenHijing* HijingStandard();
+void ProcessEnvironmentVars();
 
 void Config()
 {
-
-    // 7-DEC-2000 09:00
-    // Switch on Transition adiation simulation. 6/12/00 18:00
-    // iZDC=1  7/12/00 09:00
     // 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);
+    gRandom->SetSeed(sseed);
+    cout<<"Seed for random number generation= "<<gRandom->GetSeed()<<endl; 
 
-    // libraries required by geant321
-    gSystem->Load("libgeant321");
 
-    new TGeant3("C++ Interface to Geant3");
+   // libraries required by geant321
+#if defined(__CINT__)
+    gSystem->Load("libgeant321");
+#endif
 
-    if (!gSystem->Getenv("CONFIG_FILE"))
-    {
-        TFile  *rootfile = new TFile("galice.root", "recreate");
+    new     TGeant3("C++ Interface to Geant3");
 
-        rootfile->SetCompressionLevel(2);
-    }
+    AliRunLoader* rl=0x0;
 
-    TGeant3 *geant3 = (TGeant3 *) gMC;
+    cout<<"Config.C: Creating Run Loader ..."<<endl;
+    rl = AliRunLoader::Open("galice.root",
+                           AliConfig::fgkDefaultEventFolderName,
+                           "recreate");
+    if (rl == 0x0)
+      {
+       gAlice->Fatal("Config.C","Can not instatiate the Run Loader");
+       return;
+      }
+    rl->SetCompressionLevel(2);
+    rl->SetNumberOfEventsPerFile(3);
+    gAlice->SetRunLoader(rl);
 
     //
     // Set External decayer
@@ -72,46 +166,46 @@ void Config()
     //
     //
     //=======================================================================
-    // ******* GEANT STEERING parameters FOR ALICE SIMULATION *******
-    geant3->SetTRIG(1);         //Number of events to be processed 
-    geant3->SetSWIT(4, 10);
-    geant3->SetDEBU(0, 0, 1);
-    //geant3->SetSWIT(2,2);
-    geant3->SetDCAY(1);
-    geant3->SetPAIR(1);
-    geant3->SetCOMP(1);
-    geant3->SetPHOT(1);
-    geant3->SetPFIS(0);
-    geant3->SetDRAY(0);
-    geant3->SetANNI(1);
-    geant3->SetBREM(1);
-    geant3->SetMUNU(1);
-    geant3->SetCKOV(1);
-    geant3->SetHADR(1);         //Select pure GEANH (HADR 1) or GEANH/NUCRIN (HADR 3)
-    geant3->SetLOSS(2);
-    geant3->SetMULS(1);
-    geant3->SetRAYL(1);
-    geant3->SetAUTO(1);         //Select automatic STMIN etc... calc. (AUTO 1) or manual (AUTO 0)
-    geant3->SetABAN(0);         //Restore 3.16 behaviour for abandoned tracks
-    geant3->SetOPTI(2);         //Select optimisation level for GEANT geometry searches (0,1,2)
-    geant3->SetERAN(5.e-7);
-
-    Float_t cut = 1.e-3;        // 1MeV cut by default
-    Float_t tofmax = 1.e10;
-
-    //             GAM ELEC NHAD CHAD MUON EBREM MUHAB EDEL MUDEL MUPA TOFMAX
-    geant3->SetCUTS(cut, cut, cut, cut, cut, cut, cut, cut, cut, cut,
-                    tofmax);
     //
     //=======================================================================
     // ************* STEERING parameters FOR ALICE SIMULATION **************
     // --- Specify event type to be tracked through the ALICE setup
     // --- All positions are in cm, angles in degrees, and P and E in GeV
 
+    gMC->SetProcess("DCAY",1);
+    gMC->SetProcess("PAIR",1);
+    gMC->SetProcess("COMP",1);
+    gMC->SetProcess("PHOT",1);
+    gMC->SetProcess("PFIS",0);
+    gMC->SetProcess("DRAY",0);
+    gMC->SetProcess("ANNI",1);
+    gMC->SetProcess("BREM",1);
+    gMC->SetProcess("MUNU",1);
+    gMC->SetProcess("CKOV",1);
+    gMC->SetProcess("HADR",1);
+    gMC->SetProcess("LOSS",2);
+    gMC->SetProcess("MULS",1);
+    gMC->SetProcess("RAYL",1);
+
+    Float_t cut = 1.e-3;        // 1MeV cut by default
+    Float_t tofmax = 1.e10;
+
+    gMC->SetCut("CUTGAM", cut);
+    gMC->SetCut("CUTELE", cut);
+    gMC->SetCut("CUTNEU", cut);
+    gMC->SetCut("CUTHAD", cut);
+    gMC->SetCut("CUTMUO", cut);
+    gMC->SetCut("BCUTE",  cut); 
+    gMC->SetCut("BCUTM",  cut); 
+    gMC->SetCut("DCUTE",  cut); 
+    gMC->SetCut("DCUTM",  cut); 
+    gMC->SetCut("PPCUTM", cut);
+    gMC->SetCut("TOFMAX", tofmax); 
+
 
 // Generator Configuration
-    gAlice->SetDebug(1);
-    AliGenerator* gener = GeneratorFactory(run);
+    gAlice->SetDebug(0);
+    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
     gener->SetCutVertexZ(1.);     // Truncate at 1 sigma
@@ -119,16 +213,16 @@ void Config()
     gener->SetTrackingFlag(1);
     gener->Init();
     
-    if (mag == k2kG) {
+    if (smag == k2kG) {
        comment = comment.Append(" | L3 field 0.2 T");
-    } else if (mag == k4kG) {
+    } else if (smag == k4kG) {
        comment = comment.Append(" | L3 field 0.4 T");
-    } else if (mag == k5kG) {
+    } else if (smag == k5kG) {
        comment = comment.Append(" | L3 field 0.5 T");
     }
     
     
-    if (rad == kGluonRadiation)
+    if (srad == kGluonRadiation)
     {
        comment = comment.Append(" | Gluon Radiation On");
        
@@ -136,7 +230,7 @@ void Config()
        comment = comment.Append(" | Gluon Radiation Off");
     }
 
-    if (geo == kHoles)
+    if (sgeo == kHoles)
     {
        comment = comment.Append(" | Holes for PHOS/RICH");
        
@@ -144,14 +238,14 @@ void Config()
        comment = comment.Append(" | No holes for PHOS/RICH");
     }
 
-    printf("\n \n Comment: %s \n \n", (char*) comment);
+    printf("\n \n Comment: %s \n \n", comment.Data());
     
     
 // Field (L3 0.4 T)
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., mag);
-    rootfile->cd();
+    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., smag);
+    field->SetL3ConstField(0); //Using const. field in the barrel
+    rl->CdGAFile();
     gAlice->SetField(field);    
-    
 //
     Int_t   iABSO   = 1;
     Int_t   iDIPO   = 1;
@@ -214,7 +308,7 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-       if (geo == kHoles) {
+       if (sgeo == kHoles) {
            FRAME->SetHoles(1);
        } else {
            FRAME->SetHoles(0);
@@ -256,9 +350,9 @@ void Config()
     //
     //AliITS *ITS  = new AliITSv5asymm("ITS","Updates ITS TDR detailed version with asymmetric services");
     //
-       AliITSvPPRasymm *ITS  = new AliITSvPPRasymm("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(kFALSE);                                         // don't touch this parameter if you're not an ITS developer
+       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]
@@ -266,19 +360,7 @@ void Config()
        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
-       //
-    //AliITSvPPRsymm *ITS  = new AliITSvPPRsymm("ITS","New ITS PPR detailed version with symmetric services");
-    //ITS->SetMinorVersion(2);                                       // don't touch this parameter if you're not an ITS developer
-    //ITS->SetReadDet(kFALSE);                                       // don't touch this parameter if you're not an ITS developer
-    //ITS->SetWriteDet("$ALICE_ROOT/ITS/ITSgeometry_vPPRsymm2.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 !):
     //                                                     
@@ -334,19 +416,15 @@ void Config()
 
 
     if (iTOF) {
-       if (geo == 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");
 
     }
 
@@ -366,7 +444,7 @@ void Config()
 
         // Select the gas mixture (0: 97% Xe + 3% isobutane, 1: 90% Xe + 10% CO2)
         TRD->SetGasMix(1);
-       if (geo == kHoles) {
+       if (sgeo == kHoles) {
            // With hole in front of PHOS
            TRD->SetPHOShole();
            // With hole in front of RICH
@@ -380,10 +458,6 @@ void Config()
     {
         //=================== FMD parameters ============================
        AliFMD *FMD = new AliFMDv1("FMD", "normal FMD");
-        FMD->SetRingsSi1(256);
-        FMD->SetRingsSi2(128);
-        FMD->SetSectorsSi1(20);
-        FMD->SetSectorsSi2(40);      
    }
 
     if (iMUON)
@@ -391,6 +465,10 @@ void Config()
         //=================== MUON parameters ===========================
 
         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 ===========================
 
@@ -415,7 +493,7 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "G56_2_55_19");
+        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCAL_55_25");
     }
 
      if (iCRT)
@@ -439,13 +517,15 @@ Float_t EtaToTheta(Float_t arg){
 
 
 
-AliGenerator* GeneratorFactory(PprRun_t run) {
+AliGenerator* GeneratorFactory(PprRun_t srun) {
     Int_t isw = 3;
-    if (rad == kNoGluonRadiation) isw = 0;
+    if (srad == kNoGluonRadiation) isw = 0;
     
 
-    switch (run) {
+    AliGenerator * gGener = 0x0;
+    switch (srun) {
     case test50:
+      {
        comment = comment.Append(":HIJINGparam test 50 particles");
        AliGenHIJINGpara *gener = new AliGenHIJINGpara(50);
        gener->SetMomentumRange(0, 999999.);
@@ -454,8 +534,11 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        Float_t thmin = EtaToTheta(8);   // theta min. <---> eta max
        Float_t thmax = EtaToTheta(-8);  // theta max. <---> eta min 
        gener->SetThetaRange(thmin,thmax);
-       break;
+       gGener=gener;
+      }
+      break;
     case kParam_8000:
+      {
        comment = comment.Append(":HIJINGparam N=8000");
        AliGenHIJINGpara *gener = new AliGenHIJINGpara(86030);
        gener->SetMomentumRange(0, 999999.);
@@ -464,8 +547,11 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        Float_t thmin = EtaToTheta(8);   // theta min. <---> eta max
        Float_t thmax = EtaToTheta(-8);  // theta max. <---> eta min 
        gener->SetThetaRange(thmin,thmax);
-       break;
+       gGener=gener;
+      }
+      break;
     case kParam_4000:
+      {
        comment = comment.Append("HIJINGparam N=4000");
        AliGenHIJINGpara *gener = new AliGenHIJINGpara(43015);
        gener->SetMomentumRange(0, 999999.);
@@ -474,8 +560,11 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        Float_t thmin = EtaToTheta(8);   // theta min. <---> eta max
        Float_t thmax = EtaToTheta(-8);  // theta max. <---> eta min 
        gener->SetThetaRange(thmin,thmax);
+       gGener=gener;
+      }
        break;
     case kParam_2000:
+      {
        comment = comment.Append("HIJINGparam N=2000");
        AliGenHIJINGpara *gener = new AliGenHIJINGpara(21507);
        gener->SetMomentumRange(0, 999999.);
@@ -484,59 +573,83 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        Float_t thmin = EtaToTheta(8);   // theta min. <---> eta max
        Float_t thmax = EtaToTheta(-8);  // theta max. <---> eta min 
        gener->SetThetaRange(thmin,thmax);
-       break;
+       gGener=gener;
+      }
+      break;
 //
 //  Hijing Central
 //
     case kHijing_cent1:
+      {
        comment = comment.Append("HIJING cent1");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
        gener->SetImpactParameterRange(0., 5.);
-       break;
+       gGener=gener;
+      }
+      break;
     case kHijing_cent2:
+      {
        comment = comment.Append("HIJING cent2");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
        gener->SetImpactParameterRange(0., 2.);
-       break;
+       gGener=gener;
+      }
+      break;
 //
 // Hijing Peripheral 
 //
     case kHijing_per1:
+      {
        comment = comment.Append("HIJING per1");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
        gener->SetImpactParameterRange(5., 8.6);
-       break;
+       gGener=gener;
+      }
+      break;
     case kHijing_per2:
+      {
        comment = comment.Append("HIJING per2");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
        gener->SetImpactParameterRange(8.6, 11.2);
-       break;
+       gGener=gener;
+      }
+      break;
     case kHijing_per3:
+      {
        comment = comment.Append("HIJING per3");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
        gener->SetImpactParameterRange(11.2, 13.2);
-       break;
+       gGener=gener;
+      }
+      break;
     case kHijing_per4:
+      {
        comment = comment.Append("HIJING per4");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
        gener->SetImpactParameterRange(13.2, 15.);
-       break;
+       gGener=gener;
+      }
+      break;
     case kHijing_per5:
+      {
        comment = comment.Append("HIJING per5");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
        gener->SetImpactParameterRange(15., 100.);
-       break;
+       gGener=gener;
+      }
+      break;
 //
 //  Jet-Jet
 //
     case kHijing_jj25:
+      {
        comment = comment.Append("HIJING Jet 25 GeV");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
@@ -548,9 +661,12 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        gener->SetSimpleJets(!isw);
        gener->SetJetEtaRange(-0.3,0.3);
        gener->SetJetPhiRange(75., 165.);   
-       break;
+       gGener=gener;
+      }
+      break;
 
     case kHijing_jj50:
+      {
        comment = comment.Append("HIJING Jet 50 GeV");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
@@ -562,9 +678,12 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        gener->SetSimpleJets(!isw);
        gener->SetJetEtaRange(-0.3,0.3);
        gener->SetJetPhiRange(75., 165.);   
+       gGener=gener;
+      }
        break;
 
     case kHijing_jj75:
+      {
        comment = comment.Append("HIJING Jet 75 GeV");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
@@ -576,9 +695,12 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        gener->SetSimpleJets(!isw);
        gener->SetJetEtaRange(-0.3,0.3);
        gener->SetJetPhiRange(75., 165.);   
-       break;
+       gGener=gener;
+      }
+      break;
 
     case kHijing_jj100:
+      {
        comment = comment.Append("HIJING Jet 100 GeV");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
@@ -590,9 +712,12 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        gener->SetSimpleJets(!isw);
        gener->SetJetEtaRange(-0.3,0.3);
        gener->SetJetPhiRange(75., 165.);   
-       break;
+       gGener=gener;
+      }
+      break;
 
     case kHijing_jj200:
+      {
        comment = comment.Append("HIJING Jet 200 GeV");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
@@ -604,11 +729,14 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        gener->SetSimpleJets(!isw);
        gener->SetJetEtaRange(-0.3,0.3);
        gener->SetJetPhiRange(75., 165.);   
-       break;
+       gGener=gener;
+      }
+      break;
 //
 // Gamma-Jet
 //
     case kHijing_gj25:
+      {
        comment = comment.Append("HIJING Gamma 25 GeV");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
@@ -620,9 +748,12 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        gener->SetSimpleJets(!isw);
        gener->SetJetEtaRange(-0.12, 0.12);
         gener->SetJetPhiRange(220., 320.);
-       break;
+       gGener=gener;
+      }
+      break;
 
     case kHijing_gj50:
+      {
        comment = comment.Append("HIJING Gamma 50 GeV");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
@@ -634,9 +765,12 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        gener->SetSimpleJets(!isw);
        gener->SetJetEtaRange(-0.12, 0.12);
         gener->SetJetPhiRange(220., 320.);
-       break;
+       gGener=gener;
+      }
+      break;
 
     case kHijing_gj75:
+      {
        comment = comment.Append("HIJING Gamma 75 GeV");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
@@ -648,9 +782,12 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        gener->SetSimpleJets(!isw);
        gener->SetJetEtaRange(-0.12, 0.12);
         gener->SetJetPhiRange(220., 320.);
-       break;
+       gGener=gener;
+      }
+      break;
 
     case kHijing_gj100:
+      {
        comment = comment.Append("HIJING Gamma 100 GeV");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
@@ -662,9 +799,12 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        gener->SetSimpleJets(!isw);
        gener->SetJetEtaRange(-0.12, 0.12);
         gener->SetJetPhiRange(220., 320.);
-       break;
+       gGener=gener;
+      }
+      break;
 
     case kHijing_gj200:
+      {
        comment = comment.Append("HIJING Gamma 200 GeV");
        AliGenHijing *gener = HijingStandard();
 // impact parameter range
@@ -676,16 +816,15 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        gener->SetSimpleJets(!isw);
        gener->SetJetEtaRange(-0.12, 0.12);
         gener->SetJetPhiRange(220., 320.);
-       break;
+       gGener=gener;
+      }
+      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.);
@@ -714,9 +853,346 @@ AliGenerator* GeneratorFactory(PprRun_t run) {
        gray->SetDebug(1);
        gener->AddGenerator(hijing,"Hijing pPb", 1);
        gener->AddGenerator(gray,  "Gray Particles",1);
-       break;
+       gGener=gener;
+      }
+      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);
+       gGener=gener;
+      }
+      break;
+    case kD_TRD:
+      {
+       comment = comment.Append(" D0 for TRD at 5.5 TeV");
+       AliGenPythia *gener = new AliGenPythia(1);
+       gener->SetCutOnChild(0);
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetProcess(kPyCharm);
+       gener->SetPtHard(0.,-1);
+       gener->SetEnergyCMS(5500.);
+       gGener=gener;
+      }
+      break;
+    case kB_TRD:
+      {
+       comment = comment.Append(" B for TRD at 5.5 TeV");
+       AliGenPythia *gener = new AliGenPythia(1);
+       gener->SetCutOnChild(0);
+       gener->SetStrucFunc(kCTEQ4L);
+       gener->SetProcess(kPyBeauty);
+       gener->SetPtHard(0.,-1);
+       gener->SetEnergyCMS(5500.);
+       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:
+      {
+       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);
+       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;
+    default: break;
     }
-    return gener;
+    return gGener;
 }
 
 AliGenHijing* HijingStandard()
@@ -732,7 +1208,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
@@ -745,4 +1221,20 @@ AliGenHijing* HijingStandard()
 }
 
 
+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"));
+    }
+}