Restored functionallity
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 24 Oct 2011 11:17:46 +0000 (11:17 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 24 Oct 2011 11:17:46 +0000 (11:17 +0000)
test/merge/backgr/Config.C
test/merge/signal/Config.C

index 6f44d59..4e28668 100644 (file)
@@ -6,18 +6,20 @@
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
-#include <TDatime.h>
 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.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 <TGeoGlobalMagField.h>
+#include "STEER/STEER/AliRunLoader.h"
+#include "STEER/STEER/AliRun.h"
+#include "STEER/STEER/AliConfig.h"
+#include "STEER/STEER/AliGenerator.h"
+#include "STEER/STEER/AliSimulation.h"
+#include "STEER/STEERBase/AliLog.h"
+#include "STEER/STEERBase/AliMagF.h"
 #include "PYTHIA6/AliDecayerPythia.h"
 #include "EVGEN/AliGenHIJINGpara.h"
 #include "THijing/AliGenHijing.h"
@@ -32,7 +34,6 @@
 #include "EVGEN/AliGenGeVSim.h"
 #include "EVGEN/AliGeVSimParticle.h"
 #include "PYTHIA6/AliGenPythia.h"
-#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -116,14 +117,14 @@ const char * pprTrigConfName[] = {
 };
 
 // This part for configuration    
-//static PprRun_t srun = test50;
+
 static PprRun_t srun = kHijing_per4;
 static PprRad_t srad = kGluonRadiation;
 static AliMagF::BMap_t smag = AliMagF::k5kG;
-TDatime dat;
-static Int_t    sseed = dat.Get(); //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
+static AliMagF::BeamType_t beamType = AliMagF::kBeamTypeAA;
+static Double_t            beamEnergy = 7000.*82./208;
+static Int_t    sseed = 12345; //Set 0 to use the current time
+static PprTrigConf_t strig = kDefaultPbPbTrig; // default pp trigger configuration
 
 // Comment line 
 static TString  comment;
@@ -131,7 +132,7 @@ static TString  comment;
 // Functions
 Float_t EtaToTheta(Float_t arg);
 AliGenerator* GeneratorFactory(PprRun_t srun);
-AliGenHijing* HijingStandard();
+AliGenerator* HijingStandard();
 AliGenGeVSim* GeVSimStandard(Float_t, Float_t);
 void ProcessEnvironmentVars();
 
@@ -148,21 +149,29 @@ void Config()
     cout<<"Seed for random number generation= "<<gRandom->GetSeed()<<endl; 
 
 
-   // libraries required by geant321 and Pythia6
+   // libraries required by geant321
 #if defined(__CINT__)
-    gSystem->Load("liblhapdf.so");      // Parton density functions
-    gSystem->Load("libEGPythia6.so");   // TGenerator interface
-    gSystem->Load("libpythia6.so");     // Pythia
-    gSystem->Load("libAliPythia6.so");  // ALICE specific implementations
+    gSystem->Load("liblhapdf");
+    gSystem->Load("libEGPythia6");
+    gSystem->Load("libpythia6");
+    gSystem->Load("libAliPythia6");
     gSystem->Load("libgeant321");
+    
+    if (srun >= kHijing_cent1 && srun <= kHijing_pA) 
+      {
+       gSystem->Load("libhijing");
+       gSystem->Load("libTHijing");
+      }
 #endif
 
     new     TGeant3TGeo("C++ Interface to Geant3");
 
+  // Output every 100 tracks
+  ((TGeant3*)gMC)->SetSWIT(4,100);
+
     AliRunLoader* rl=0x0;
 
-    AliLog::Message(AliLog::kInfo, "Creating Run Loader", 
-                   "", "", "Config()"," Config.C", __LINE__);
+    AliLog::Message(AliLog::kInfo, "Creating Run Loader", "", "", "Config()"," ConfigPPR.C", __LINE__);
 
     rl = AliRunLoader::Open("galice.root",
                            AliConfig::GetDefaultEventFolderName(),
@@ -173,7 +182,7 @@ void Config()
        return;
       }
     rl->SetCompressionLevel(2);
-    rl->SetNumberOfEventsPerFile(3);
+    rl->SetNumberOfEventsPerFile(100);
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
@@ -240,10 +249,6 @@ void Config()
     gMC->SetCut("PPCUTM", cut);
     gMC->SetCut("TOFMAX", tofmax); 
 
-    // Debug and log level
-    //    AliLog::SetGlobalDebugLevel(0);
-    //    AliLog::SetGlobalLogLevel(AliLog::kError);
-
     // Generator Configuration
     AliGenerator* gener = GeneratorFactory(srun);
     gener->SetOrigin(0, 0, 0);    // vertex position
@@ -257,8 +262,7 @@ void Config()
        comment = comment.Append(" | L3 field 0.2 T");
     } else if (smag == AliMagF::k5kG) {
        comment = comment.Append(" | L3 field 0.5 T");
-    } else AliLog::Message(AliLog::kFatal, "Invalid Mag Field", 
-                          "", "", "Config()"," Config.C", __LINE__);
+    }
     
     
     if (srad == kGluonRadiation)
@@ -272,8 +276,9 @@ void Config()
     printf("\n \n Comment: %s \n \n", comment.Data());
     
     
-// Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., smag));
+// Field
+    TGeoGlobalMagField::Instance()->SetField
+      (new AliMagF("Maps","Maps", -1., -1., smag,beamType,beamEnergy));
     rl->CdGAFile();
 //
     Int_t   iABSO   = 1;
@@ -287,9 +292,9 @@ void Config()
     Int_t   iPHOS   = 1;
     Int_t   iPIPE   = 1;
     Int_t   iPMD    = 1;
-    Int_t   iHMPID   = 1;
+    Int_t   iHMPID  = 1;
     Int_t   iSHIL   = 1;
-    Int_t   iT0  = 1;
+    Int_t   iT0     = 1;
     Int_t   iTOF    = 1;
     Int_t   iTPC    = 1;
     Int_t   iTRD    = 1;
@@ -443,7 +448,7 @@ void Config()
 
      if (iVZERO)
     {
-        //=================== ACORDE parameters ============================
+        //=================== VZERO parameters ============================
         AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO");
     }
  
@@ -457,965 +462,1020 @@ Float_t EtaToTheta(Float_t arg){
 
 
 AliGenerator* GeneratorFactory(PprRun_t srun) {
-    Int_t isw = 3;
-    if (srad == kNoGluonRadiation) isw = 0;
-    
-
-    AliGenerator * gGener = 0x0;
-    switch (srun) {
+  Int_t isw = 3;
+  if (srad == kNoGluonRadiation) isw = 0;
+  
+  
+  AliGenerator * gGener = 0x0;
+  switch (srun) {
     case test50:
-      {
-       comment = comment.Append(":HIJINGparam test 50 particles");
-       AliGenHIJINGpara *gener = new AliGenHIJINGpara(50);
-       gener->SetMomentumRange(0, 999999.);
-       gener->SetPhiRange(0., 360.);
-       // Set pseudorapidity range from -8 to 8.
-       Float_t thmin = EtaToTheta(8);   // theta min. <---> eta max
-       Float_t thmax = EtaToTheta(-8);  // theta max. <---> eta min 
-       gener->SetThetaRange(thmin,thmax);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append(":HIJINGparam test 50 particles");
+      AliGenHIJINGpara *gener = new AliGenHIJINGpara(50);
+      gener->SetMomentumRange(0, 999999.);
+      gener->SetPhiRange(0., 360.);
+      // Set pseudorapidity range from -8 to 8.
+      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_8000:
-      {
-       comment = comment.Append(":HIJINGparam N=8000");
-       AliGenHIJINGpara *gener = new AliGenHIJINGpara(86030);
-       gener->SetMomentumRange(0, 999999.);
-       gener->SetPhiRange(0., 360.);
-       // Set pseudorapidity range from -8 to 8.
-       Float_t thmin = EtaToTheta(8);   // theta min. <---> eta max
-       Float_t thmax = EtaToTheta(-8);  // theta max. <---> eta min 
-       gener->SetThetaRange(thmin,thmax);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append(":HIJINGparam N=8000");
+      AliGenHIJINGpara *gener = new AliGenHIJINGpara(86030);
+      gener->SetMomentumRange(0, 999999.);
+      gener->SetPhiRange(0., 360.);
+      // Set pseudorapidity range from -8 to 8.
+      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_4000:
-      {
-       comment = comment.Append("HIJINGparam N=4000");
-       AliGenHIJINGpara *gener = new AliGenHIJINGpara(43015);
-       gener->SetMomentumRange(0, 999999.);
-       gener->SetPhiRange(0., 360.);
-       // Set pseudorapidity range from -8 to 8.
-       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;
+    {
+      comment = comment.Append("HIJINGparam N=4000");
+      AliGenHIJINGpara *gener = new AliGenHIJINGpara(43015);
+      gener->SetMomentumRange(0, 999999.);
+      gener->SetPhiRange(0., 360.);
+      // Set pseudorapidity range from -8 to 8.
+      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.);
-       gener->SetPhiRange(0., 360.);
-       // Set pseudorapidity range from -8 to 8.
-       Float_t thmin = EtaToTheta(8);   // theta min. <---> eta max
-       Float_t thmax = EtaToTheta(-8);  // theta max. <---> eta min 
-       gener->SetThetaRange(thmin,thmax);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJINGparam N=2000");
+      AliGenHIJINGpara *gener = new AliGenHIJINGpara(21507);
+      gener->SetMomentumRange(0, 999999.);
+      gener->SetPhiRange(0., 360.);
+      // Set pseudorapidity range from -8 to 8.
+      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;
-//
-//  Hijing Central
-//
+      //
+      //  Hijing Central
+      //
     case kHijing_cent1:
-      {
-       comment = comment.Append("HIJING cent1");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING cent1");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      gGener=gener;
+    }
       break;
     case kHijing_cent2:
-      {
-       comment = comment.Append("HIJING cent2");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 2.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING cent2");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 2.);
+      gGener=gener;
+    }
       break;
-//
-// Hijing Peripheral 
-//
+      //
+      // Hijing Peripheral 
+      //
     case kHijing_per1:
-      {
-       comment = comment.Append("HIJING per1");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(5., 8.6);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING per1");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(5., 8.6);
+      gGener=gener;
+    }
       break;
     case kHijing_per2:
-      {
-       comment = comment.Append("HIJING per2");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(8.6, 11.2);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING per2");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(8.6, 11.2);
+      gGener=gener;
+    }
       break;
     case kHijing_per3:
-      {
-       comment = comment.Append("HIJING per3");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(11.2, 13.2);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING per3");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(11.2, 13.2);
+      gGener=gener;
+    }
       break;
     case kHijing_per4:
-      {
-       comment = comment.Append("HIJING per4");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(13.2, 15.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING per4");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(13.2, 15.);
+      gGener=gener;
+    }
       break;
     case kHijing_per5:
-      {
-       comment = comment.Append("HIJING per5");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(15., 100.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING per5");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(15., 100.);
+      gGener=gener;
+    }
       break;
-//
-//  Jet-Jet
-//
+      //
+      //  Jet-Jet
+      //
     case kHijing_jj25:
-      {
-       comment = comment.Append("HIJING Jet 25 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(1);
-       gener->SetPtJet(25.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.3,0.3);
-       gener->SetJetPhiRange(75., 165.);   
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Jet 25 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(1);
+      gener->SetPtJet(25.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.3,0.3);
+      gener->SetJetPhiRange(75., 165.);   
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_jj50:
-      {
-       comment = comment.Append("HIJING Jet 50 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(1);
-       gener->SetPtJet(50.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.3,0.3);
-       gener->SetJetPhiRange(75., 165.);   
-       gGener=gener;
-      }
-       break;
-
+    {
+      comment = comment.Append("HIJING Jet 50 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(1);
+      gener->SetPtJet(50.);
+      gener->SetRadiation(isw);
+      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
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(1);
-       gener->SetPtJet(75.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.3,0.3);
-       gener->SetJetPhiRange(75., 165.);   
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Jet 75 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(1);
+      gener->SetPtJet(75.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.3,0.3);
+      gener->SetJetPhiRange(75., 165.);   
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_jj100:
-      {
-       comment = comment.Append("HIJING Jet 100 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(1);
-       gener->SetPtJet(100.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.3,0.3);
-       gener->SetJetPhiRange(75., 165.);   
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Jet 100 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(1);
+      gener->SetPtJet(100.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.3,0.3);
+      gener->SetJetPhiRange(75., 165.);   
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_jj200:
-      {
-       comment = comment.Append("HIJING Jet 200 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(1);
-       gener->SetPtJet(200.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.3,0.3);
-       gener->SetJetPhiRange(75., 165.);   
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Jet 200 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(1);
+      gener->SetPtJet(200.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.3,0.3);
+      gener->SetJetPhiRange(75., 165.);   
+      gGener=gener;
+    }
       break;
-//
-// Gamma-Jet
-//
+      //
+      // Gamma-Jet
+      //
     case kHijing_gj25:
-      {
-       comment = comment.Append("HIJING Gamma 25 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(2);
-       gener->SetPtJet(25.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.12, 0.12);
-        gener->SetJetPhiRange(220., 320.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Gamma 25 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(2);
+      gener->SetPtJet(25.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.12, 0.12);
+      gener->SetJetPhiRange(220., 320.);
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_gj50:
-      {
-       comment = comment.Append("HIJING Gamma 50 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(2);
-       gener->SetPtJet(50.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.12, 0.12);
-        gener->SetJetPhiRange(220., 320.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Gamma 50 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(2);
+      gener->SetPtJet(50.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.12, 0.12);
+      gener->SetJetPhiRange(220., 320.);
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_gj75:
-      {
-       comment = comment.Append("HIJING Gamma 75 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(2);
-       gener->SetPtJet(75.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.12, 0.12);
-        gener->SetJetPhiRange(220., 320.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Gamma 75 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(2);
+      gener->SetPtJet(75.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.12, 0.12);
+      gener->SetJetPhiRange(220., 320.);
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_gj100:
-      {
-       comment = comment.Append("HIJING Gamma 100 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(2);
-       gener->SetPtJet(100.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.12, 0.12);
-        gener->SetJetPhiRange(220., 320.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Gamma 100 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(2);
+      gener->SetPtJet(100.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.12, 0.12);
+      gener->SetJetPhiRange(220., 320.);
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_gj200:
-      {
-       comment = comment.Append("HIJING Gamma 200 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(2);
-       gener->SetPtJet(200.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.12, 0.12);
-        gener->SetJetPhiRange(220., 320.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Gamma 200 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(2);
+      gener->SetPtJet(200.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.12, 0.12);
+      gener->SetJetPhiRange(220., 320.);
+      gGener=gener;
+    }
       break;
     case kHijing_pA:
-      {
-       comment = comment.Append("HIJING pA");
-
-       AliGenCocktail *gener  = new AliGenCocktail();
-
-       AliGenHijing   *hijing = new AliGenHijing(-1);
-// centre of mass energy 
-       hijing->SetEnergyCMS(TMath::Sqrt(82./208.) * 14000.);
-// impact parameter range
-       hijing->SetImpactParameterRange(0., 15.);
-// reference frame
-       hijing->SetReferenceFrame("CMS");
-       hijing->SetBoostLHC(1);
-// projectile
-       hijing->SetProjectile("P", 1, 1);
-       hijing->SetTarget    ("A", 208, 82);
-// tell hijing to keep the full parent child chain
-       hijing->KeepFullEvent();
-// enable jet quenching
-       hijing->SetJetQuenching(0);
-// enable shadowing
-       hijing->SetShadowing(1);
-// Don't track spectators
-       hijing->SetSpectators(0);
-// kinematic selection
-       hijing->SetSelectAll(0);
-//
-       AliGenSlowNucleons*  gray    = new AliGenSlowNucleons(1);
-       AliSlowNucleonModel* model   = new AliSlowNucleonModelExp();
-       gray->SetSlowNucleonModel(model);
-       gray->SetDebug(1);
-       gener->AddGenerator(hijing,"Hijing pPb", 1);
-       gener->AddGenerator(gray,  "Gray Particles",1);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING pA");
+      
+      AliGenCocktail *gener  = new AliGenCocktail();
+      
+      AliGenHijing   *hijing = new AliGenHijing(-1);
+      // centre of mass energy 
+      hijing->SetEnergyCMS(TMath::Sqrt(82./208.) * 14000.);
+      // impact parameter range
+      hijing->SetImpactParameterRange(0., 15.);
+      // reference frame
+      hijing->SetReferenceFrame("CMS");
+      hijing->SetBoostLHC(1);
+      // projectile
+      hijing->SetProjectile("P", 1, 1);
+      hijing->SetTarget    ("A", 208, 82);
+      // tell hijing to keep the full parent child chain
+      hijing->KeepFullEvent();
+      // enable jet quenching
+      hijing->SetJetQuenching(0);
+      // enable shadowing
+      hijing->SetShadowing(1);
+      // Don't track spectators
+      hijing->SetSpectators(0);
+      // kinematic selection
+      hijing->SetSelectAll(0);
+      //
+      AliGenSlowNucleons*  gray    = new AliGenSlowNucleons(1);
+      AliSlowNucleonModel* model   = new AliSlowNucleonModelExp();
+      gray->SetSlowNucleonModel(model);
+      gray->SetDebug(1);
+      gener->AddGenerator(hijing,"Hijing pPb", 1);
+      gener->AddGenerator(gray,  "Gray Particles",1);
+      gGener=gener;
+    }
       break;
     case kPythia6:
-      {
-        comment = comment.Append(":Pythia p-p @ 14 TeV");
-        AliGenPythia *gener = new AliGenPythia(-1); 
-        gener->SetMomentumRange(0,999999);
-        gener->SetThetaRange(0., 180.);
-        gener->SetYRange(-12,12);
-        gener->SetPtRange(0,1000);
-        gener->SetProcess(kPyMb);
-        gener->SetEnergyCMS(14000.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append(":Pythia p-p @ 14 TeV");
+      AliGenPythia *gener = new AliGenPythia(-1); 
+      gener->SetMomentumRange(0,999999);
+      gener->SetThetaRange(0., 180.);
+      gener->SetYRange(-12,12);
+      gener->SetPtRange(0,1000);
+      gener->SetProcess(kPyMb);
+      gener->SetEnergyCMS(14000.);
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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);
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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);
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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);
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      gGener=gener;
+    }
       break;
     case kCocktailTRD:
-      {
-       comment = comment.Append(" Cocktail for TRD at 5.5 TeV");
-       AliGenCocktail *gener  = new AliGenCocktail();
-       
-       AliGenParam *phi = new AliGenParam(10,
+    {
+      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::kPhi,
+                                           AliGenMUONlib::kOmega,
                                            "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;
-      }
+      
+      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);
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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);
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 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;
-      }
+    {
+      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);
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 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(0.,5.);  //Centrality class Cent1 for PDC04
-       gGener=gener;
-      }
+    {
+      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;
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+    }
       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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      gGener=gener;
+    }
       break;
     case kFlow_2_2000:
     {
-       comment = comment.Append(" Flow with dN/deta  = 2000, vn = 2%");
-       gGener = GeVSimStandard(2000., 2.);
+      comment = comment.Append(" Flow with dN/deta  = 2000, vn = 2%");
+      gGener = GeVSimStandard(2000., 2.);
     }
-    break;
-    
+      break;
+      
     case kFlow_10_2000:
     {
-       comment = comment.Append(" Flow with dN/deta  = 2000, vn = 10%");
-       gGener = GeVSimStandard(2000., 10.);
+      comment = comment.Append(" Flow with dN/deta  = 2000, vn = 10%");
+      gGener = GeVSimStandard(2000., 10.);
     }
-    break;
-    
+      break;
+      
     case kFlow_6_2000:
     {
-       comment = comment.Append(" Flow with dN/deta  = 2000, vn = 6%");
-       gGener = GeVSimStandard(2000., 6.);
+      comment = comment.Append(" Flow with dN/deta  = 2000, vn = 6%");
+      gGener = GeVSimStandard(2000., 6.);
     }
-    break;
-    
+      break;
+      
     case kFlow_6_5000:
     {
-       comment = comment.Append(" Flow with dN/deta  = 5000, vn = 6%");
-       gGener = GeVSimStandard(5000., 6.);
+      comment = comment.Append(" Flow with dN/deta  = 5000, vn = 6%");
+      gGener = GeVSimStandard(5000., 6.);
     }
-    break;
+      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 = 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 = 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;
+      //
+      // 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 = 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 = 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 = (AliGenHijing*)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);
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      gGener = gener;
     }
-    
-    return gGener;
+      break;
+    default: break;
+  }
+  
+  return gGener;
 }
 
-AliGenHijing* HijingStandard()
+AliGenerator* HijingStandard()
 {
+  
     AliGenHijing *gener = new AliGenHijing(-1);
 // centre of mass energy 
     gener->SetEnergyCMS(5500.);
index b8ed19b..32680e1 100644 (file)
@@ -6,18 +6,20 @@
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
-#include <TDatime.h>
 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.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 <TGeoGlobalMagField.h>
+#include "STEER/STEER/AliRunLoader.h"
+#include "STEER/STEER/AliRun.h"
+#include "STEER/STEER/AliConfig.h"
+#include "STEER/STEER/AliGenerator.h"
+#include "STEER/STEER/AliSimulation.h"
+#include "STEER/STEERBase/AliLog.h"
+#include "STEER/STEERBase/AliMagF.h"
 #include "PYTHIA6/AliDecayerPythia.h"
 #include "EVGEN/AliGenHIJINGpara.h"
 #include "THijing/AliGenHijing.h"
@@ -32,7 +34,6 @@
 #include "EVGEN/AliGenGeVSim.h"
 #include "EVGEN/AliGeVSimParticle.h"
 #include "PYTHIA6/AliGenPythia.h"
-#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -116,14 +117,14 @@ const char * pprTrigConfName[] = {
 };
 
 // This part for configuration    
-//static PprRun_t srun = test50;
+
 static PprRun_t srun = kPythia6;
 static PprRad_t srad = kGluonRadiation;
 static AliMagF::BMap_t smag = AliMagF::k5kG;
-TDatime dat;
-static Int_t    sseed = dat.Get(); //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
+static AliMagF::BeamType_t beamType = AliMagF::kBeamTypeAA;
+static Double_t            beamEnergy = 7000.*82./208;
+static Int_t    sseed = 12345; //Set 0 to use the current time
+static PprTrigConf_t strig = kDefaultPbPbTrig; // default pp trigger configuration
 
 // Comment line 
 static TString  comment;
@@ -131,7 +132,7 @@ static TString  comment;
 // Functions
 Float_t EtaToTheta(Float_t arg);
 AliGenerator* GeneratorFactory(PprRun_t srun);
-AliGenHijing* HijingStandard();
+AliGenerator* HijingStandard();
 AliGenGeVSim* GeVSimStandard(Float_t, Float_t);
 void ProcessEnvironmentVars();
 
@@ -148,17 +149,26 @@ void Config()
     cout<<"Seed for random number generation= "<<gRandom->GetSeed()<<endl; 
 
 
-   // libraries required by geant321 and Pythia6
+   // libraries required by geant321
 #if defined(__CINT__)
-    gSystem->Load("liblhapdf.so");      // Parton density functions
-    gSystem->Load("libEGPythia6.so");   // TGenerator interface
-    gSystem->Load("libpythia6.so");     // Pythia
-    gSystem->Load("libAliPythia6.so");  // ALICE specific implementations
+    gSystem->Load("liblhapdf");
+    gSystem->Load("libEGPythia6");
+    gSystem->Load("libpythia6");
+    gSystem->Load("libAliPythia6");
     gSystem->Load("libgeant321");
+    
+    if (srun >= kHijing_cent1 && srun <= kHijing_pA) 
+      {
+       gSystem->Load("libhijing");
+       gSystem->Load("libTHijing");
+      }
 #endif
 
     new     TGeant3TGeo("C++ Interface to Geant3");
 
+  // Output every 100 tracks
+  ((TGeant3*)gMC)->SetSWIT(4,100);
+
     AliRunLoader* rl=0x0;
 
     AliLog::Message(AliLog::kInfo, "Creating Run Loader", "", "", "Config()"," ConfigPPR.C", __LINE__);
@@ -172,7 +182,7 @@ void Config()
        return;
       }
     rl->SetCompressionLevel(2);
-    rl->SetNumberOfEventsPerFile(3);
+    rl->SetNumberOfEventsPerFile(100);
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
@@ -239,10 +249,6 @@ void Config()
     gMC->SetCut("PPCUTM", cut);
     gMC->SetCut("TOFMAX", tofmax); 
 
-    // Debug and log level
-    //    AliLog::SetGlobalDebugLevel(0);
-    //    AliLog::SetGlobalLogLevel(AliLog::kError);
-
     // Generator Configuration
     AliGenerator* gener = GeneratorFactory(srun);
     gener->SetOrigin(0, 0, 0);    // vertex position
@@ -256,8 +262,7 @@ void Config()
        comment = comment.Append(" | L3 field 0.2 T");
     } else if (smag == AliMagF::k5kG) {
        comment = comment.Append(" | L3 field 0.5 T");
-    } else AliLog::Message(AliLog::kFatal, "Invalid Mag Field", 
-                          "", "", "Config()"," Config.C", __LINE__);
+    }
     
     
     if (srad == kGluonRadiation)
@@ -271,8 +276,9 @@ void Config()
     printf("\n \n Comment: %s \n \n", comment.Data());
     
     
-// Field (L3 0.4 T)
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",-1., -1., smag));
+// Field
+    TGeoGlobalMagField::Instance()->SetField
+      (new AliMagF("Maps","Maps", -1., -1., smag,beamType,beamEnergy));
     rl->CdGAFile();
 //
     Int_t   iABSO   = 1;
@@ -286,9 +292,9 @@ void Config()
     Int_t   iPHOS   = 1;
     Int_t   iPIPE   = 1;
     Int_t   iPMD    = 1;
-    Int_t   iHMPID   = 1;
+    Int_t   iHMPID  = 1;
     Int_t   iSHIL   = 1;
-    Int_t   iT0  = 1;
+    Int_t   iT0     = 1;
     Int_t   iTOF    = 1;
     Int_t   iTPC    = 1;
     Int_t   iTRD    = 1;
@@ -442,7 +448,7 @@ void Config()
 
      if (iVZERO)
     {
-        //=================== ACORDE parameters ============================
+        //=================== VZERO parameters ============================
         AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO");
     }
  
@@ -456,965 +462,1020 @@ Float_t EtaToTheta(Float_t arg){
 
 
 AliGenerator* GeneratorFactory(PprRun_t srun) {
-    Int_t isw = 3;
-    if (srad == kNoGluonRadiation) isw = 0;
-    
-
-    AliGenerator * gGener = 0x0;
-    switch (srun) {
+  Int_t isw = 3;
+  if (srad == kNoGluonRadiation) isw = 0;
+  
+  
+  AliGenerator * gGener = 0x0;
+  switch (srun) {
     case test50:
-      {
-       comment = comment.Append(":HIJINGparam test 50 particles");
-       AliGenHIJINGpara *gener = new AliGenHIJINGpara(50);
-       gener->SetMomentumRange(0, 999999.);
-       gener->SetPhiRange(0., 360.);
-       // Set pseudorapidity range from -8 to 8.
-       Float_t thmin = EtaToTheta(8);   // theta min. <---> eta max
-       Float_t thmax = EtaToTheta(-8);  // theta max. <---> eta min 
-       gener->SetThetaRange(thmin,thmax);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append(":HIJINGparam test 50 particles");
+      AliGenHIJINGpara *gener = new AliGenHIJINGpara(50);
+      gener->SetMomentumRange(0, 999999.);
+      gener->SetPhiRange(0., 360.);
+      // Set pseudorapidity range from -8 to 8.
+      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_8000:
-      {
-       comment = comment.Append(":HIJINGparam N=8000");
-       AliGenHIJINGpara *gener = new AliGenHIJINGpara(86030);
-       gener->SetMomentumRange(0, 999999.);
-       gener->SetPhiRange(0., 360.);
-       // Set pseudorapidity range from -8 to 8.
-       Float_t thmin = EtaToTheta(8);   // theta min. <---> eta max
-       Float_t thmax = EtaToTheta(-8);  // theta max. <---> eta min 
-       gener->SetThetaRange(thmin,thmax);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append(":HIJINGparam N=8000");
+      AliGenHIJINGpara *gener = new AliGenHIJINGpara(86030);
+      gener->SetMomentumRange(0, 999999.);
+      gener->SetPhiRange(0., 360.);
+      // Set pseudorapidity range from -8 to 8.
+      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_4000:
-      {
-       comment = comment.Append("HIJINGparam N=4000");
-       AliGenHIJINGpara *gener = new AliGenHIJINGpara(43015);
-       gener->SetMomentumRange(0, 999999.);
-       gener->SetPhiRange(0., 360.);
-       // Set pseudorapidity range from -8 to 8.
-       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;
+    {
+      comment = comment.Append("HIJINGparam N=4000");
+      AliGenHIJINGpara *gener = new AliGenHIJINGpara(43015);
+      gener->SetMomentumRange(0, 999999.);
+      gener->SetPhiRange(0., 360.);
+      // Set pseudorapidity range from -8 to 8.
+      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.);
-       gener->SetPhiRange(0., 360.);
-       // Set pseudorapidity range from -8 to 8.
-       Float_t thmin = EtaToTheta(8);   // theta min. <---> eta max
-       Float_t thmax = EtaToTheta(-8);  // theta max. <---> eta min 
-       gener->SetThetaRange(thmin,thmax);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJINGparam N=2000");
+      AliGenHIJINGpara *gener = new AliGenHIJINGpara(21507);
+      gener->SetMomentumRange(0, 999999.);
+      gener->SetPhiRange(0., 360.);
+      // Set pseudorapidity range from -8 to 8.
+      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;
-//
-//  Hijing Central
-//
+      //
+      //  Hijing Central
+      //
     case kHijing_cent1:
-      {
-       comment = comment.Append("HIJING cent1");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING cent1");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      gGener=gener;
+    }
       break;
     case kHijing_cent2:
-      {
-       comment = comment.Append("HIJING cent2");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 2.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING cent2");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 2.);
+      gGener=gener;
+    }
       break;
-//
-// Hijing Peripheral 
-//
+      //
+      // Hijing Peripheral 
+      //
     case kHijing_per1:
-      {
-       comment = comment.Append("HIJING per1");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(5., 8.6);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING per1");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(5., 8.6);
+      gGener=gener;
+    }
       break;
     case kHijing_per2:
-      {
-       comment = comment.Append("HIJING per2");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(8.6, 11.2);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING per2");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(8.6, 11.2);
+      gGener=gener;
+    }
       break;
     case kHijing_per3:
-      {
-       comment = comment.Append("HIJING per3");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(11.2, 13.2);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING per3");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(11.2, 13.2);
+      gGener=gener;
+    }
       break;
     case kHijing_per4:
-      {
-       comment = comment.Append("HIJING per4");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(13.2, 15.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING per4");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(13.2, 15.);
+      gGener=gener;
+    }
       break;
     case kHijing_per5:
-      {
-       comment = comment.Append("HIJING per5");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(15., 100.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING per5");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(15., 100.);
+      gGener=gener;
+    }
       break;
-//
-//  Jet-Jet
-//
+      //
+      //  Jet-Jet
+      //
     case kHijing_jj25:
-      {
-       comment = comment.Append("HIJING Jet 25 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(1);
-       gener->SetPtJet(25.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.3,0.3);
-       gener->SetJetPhiRange(75., 165.);   
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Jet 25 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(1);
+      gener->SetPtJet(25.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.3,0.3);
+      gener->SetJetPhiRange(75., 165.);   
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_jj50:
-      {
-       comment = comment.Append("HIJING Jet 50 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(1);
-       gener->SetPtJet(50.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.3,0.3);
-       gener->SetJetPhiRange(75., 165.);   
-       gGener=gener;
-      }
-       break;
-
+    {
+      comment = comment.Append("HIJING Jet 50 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(1);
+      gener->SetPtJet(50.);
+      gener->SetRadiation(isw);
+      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
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(1);
-       gener->SetPtJet(75.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.3,0.3);
-       gener->SetJetPhiRange(75., 165.);   
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Jet 75 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(1);
+      gener->SetPtJet(75.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.3,0.3);
+      gener->SetJetPhiRange(75., 165.);   
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_jj100:
-      {
-       comment = comment.Append("HIJING Jet 100 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(1);
-       gener->SetPtJet(100.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.3,0.3);
-       gener->SetJetPhiRange(75., 165.);   
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Jet 100 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(1);
+      gener->SetPtJet(100.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.3,0.3);
+      gener->SetJetPhiRange(75., 165.);   
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_jj200:
-      {
-       comment = comment.Append("HIJING Jet 200 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(1);
-       gener->SetPtJet(200.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.3,0.3);
-       gener->SetJetPhiRange(75., 165.);   
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Jet 200 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(1);
+      gener->SetPtJet(200.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.3,0.3);
+      gener->SetJetPhiRange(75., 165.);   
+      gGener=gener;
+    }
       break;
-//
-// Gamma-Jet
-//
+      //
+      // Gamma-Jet
+      //
     case kHijing_gj25:
-      {
-       comment = comment.Append("HIJING Gamma 25 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(2);
-       gener->SetPtJet(25.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.12, 0.12);
-        gener->SetJetPhiRange(220., 320.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Gamma 25 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(2);
+      gener->SetPtJet(25.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.12, 0.12);
+      gener->SetJetPhiRange(220., 320.);
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_gj50:
-      {
-       comment = comment.Append("HIJING Gamma 50 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(2);
-       gener->SetPtJet(50.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.12, 0.12);
-        gener->SetJetPhiRange(220., 320.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Gamma 50 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(2);
+      gener->SetPtJet(50.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.12, 0.12);
+      gener->SetJetPhiRange(220., 320.);
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_gj75:
-      {
-       comment = comment.Append("HIJING Gamma 75 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(2);
-       gener->SetPtJet(75.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.12, 0.12);
-        gener->SetJetPhiRange(220., 320.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Gamma 75 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(2);
+      gener->SetPtJet(75.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.12, 0.12);
+      gener->SetJetPhiRange(220., 320.);
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_gj100:
-      {
-       comment = comment.Append("HIJING Gamma 100 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(2);
-       gener->SetPtJet(100.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.12, 0.12);
-        gener->SetJetPhiRange(220., 320.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Gamma 100 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(2);
+      gener->SetPtJet(100.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.12, 0.12);
+      gener->SetJetPhiRange(220., 320.);
+      gGener=gener;
+    }
       break;
-
+      
     case kHijing_gj200:
-      {
-       comment = comment.Append("HIJING Gamma 200 GeV");
-       AliGenHijing *gener = HijingStandard();
-// impact parameter range
-       gener->SetImpactParameterRange(0., 5.);
-       // trigger
-       gener->SetTrigger(2);
-       gener->SetPtJet(200.);
-       gener->SetRadiation(isw);
-       gener->SetSimpleJets(!isw);
-       gener->SetJetEtaRange(-0.12, 0.12);
-        gener->SetJetPhiRange(220., 320.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING Gamma 200 GeV");
+      AliGenHijing *gener = (AliGenHijing*)HijingStandard();
+      // impact parameter range
+      gener->SetImpactParameterRange(0., 5.);
+      // trigger
+      gener->SetTrigger(2);
+      gener->SetPtJet(200.);
+      gener->SetRadiation(isw);
+      gener->SetSimpleJets(!isw);
+      gener->SetJetEtaRange(-0.12, 0.12);
+      gener->SetJetPhiRange(220., 320.);
+      gGener=gener;
+    }
       break;
     case kHijing_pA:
-      {
-       comment = comment.Append("HIJING pA");
-
-       AliGenCocktail *gener  = new AliGenCocktail();
-
-       AliGenHijing   *hijing = new AliGenHijing(-1);
-// centre of mass energy 
-       hijing->SetEnergyCMS(TMath::Sqrt(82./208.) * 14000.);
-// impact parameter range
-       hijing->SetImpactParameterRange(0., 15.);
-// reference frame
-       hijing->SetReferenceFrame("CMS");
-       hijing->SetBoostLHC(1);
-// projectile
-       hijing->SetProjectile("P", 1, 1);
-       hijing->SetTarget    ("A", 208, 82);
-// tell hijing to keep the full parent child chain
-       hijing->KeepFullEvent();
-// enable jet quenching
-       hijing->SetJetQuenching(0);
-// enable shadowing
-       hijing->SetShadowing(1);
-// Don't track spectators
-       hijing->SetSpectators(0);
-// kinematic selection
-       hijing->SetSelectAll(0);
-//
-       AliGenSlowNucleons*  gray    = new AliGenSlowNucleons(1);
-       AliSlowNucleonModel* model   = new AliSlowNucleonModelExp();
-       gray->SetSlowNucleonModel(model);
-       gray->SetDebug(1);
-       gener->AddGenerator(hijing,"Hijing pPb", 1);
-       gener->AddGenerator(gray,  "Gray Particles",1);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append("HIJING pA");
+      
+      AliGenCocktail *gener  = new AliGenCocktail();
+      
+      AliGenHijing   *hijing = new AliGenHijing(-1);
+      // centre of mass energy 
+      hijing->SetEnergyCMS(TMath::Sqrt(82./208.) * 14000.);
+      // impact parameter range
+      hijing->SetImpactParameterRange(0., 15.);
+      // reference frame
+      hijing->SetReferenceFrame("CMS");
+      hijing->SetBoostLHC(1);
+      // projectile
+      hijing->SetProjectile("P", 1, 1);
+      hijing->SetTarget    ("A", 208, 82);
+      // tell hijing to keep the full parent child chain
+      hijing->KeepFullEvent();
+      // enable jet quenching
+      hijing->SetJetQuenching(0);
+      // enable shadowing
+      hijing->SetShadowing(1);
+      // Don't track spectators
+      hijing->SetSpectators(0);
+      // kinematic selection
+      hijing->SetSelectAll(0);
+      //
+      AliGenSlowNucleons*  gray    = new AliGenSlowNucleons(1);
+      AliSlowNucleonModel* model   = new AliSlowNucleonModelExp();
+      gray->SetSlowNucleonModel(model);
+      gray->SetDebug(1);
+      gener->AddGenerator(hijing,"Hijing pPb", 1);
+      gener->AddGenerator(gray,  "Gray Particles",1);
+      gGener=gener;
+    }
       break;
     case kPythia6:
-      {
-        comment = comment.Append(":Pythia p-p @ 14 TeV");
-        AliGenPythia *gener = new AliGenPythia(-1); 
-        gener->SetMomentumRange(0,999999);
-        gener->SetThetaRange(0., 180.);
-        gener->SetYRange(-12,12);
-        gener->SetPtRange(0,1000);
-        gener->SetProcess(kPyMb);
-        gener->SetEnergyCMS(14000.);
-       gGener=gener;
-      }
+    {
+      comment = comment.Append(":Pythia p-p @ 14 TeV");
+      AliGenPythia *gener = new AliGenPythia(-1); 
+      gener->SetMomentumRange(0,999999);
+      gener->SetThetaRange(0., 180.);
+      gener->SetYRange(-12,12);
+      gener->SetPtRange(0,1000);
+      gener->SetProcess(kPyMb);
+      gener->SetEnergyCMS(14000.);
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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;
-      }
+    {
+      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.)
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 1) ; 
+      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;
-      }
+    {
+      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);
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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);
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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);
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      gGener=gener;
+    }
       break;
     case kCocktailTRD:
-      {
-       comment = comment.Append(" Cocktail for TRD at 5.5 TeV");
-       AliGenCocktail *gener  = new AliGenCocktail();
-       
-       AliGenParam *phi = new AliGenParam(10,
+    {
+      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::kPhi,
+                                           AliGenMUONlib::kOmega,
                                            "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;
-      }
+      
+      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);
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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);
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 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;
-      }
+    {
+      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);
+      gener->SetProjectile("p", 1, 1) ; 
+      gener->SetTarget("p", 1, 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(0.,5.);  //Centrality class Cent1 for PDC04
-       gGener=gener;
-      }
+    {
+      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;
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+    }
       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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      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;
-      }
+    {
+      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
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      gGener=gener;
+    }
       break;
     case kFlow_2_2000:
     {
-       comment = comment.Append(" Flow with dN/deta  = 2000, vn = 2%");
-       gGener = GeVSimStandard(2000., 2.);
+      comment = comment.Append(" Flow with dN/deta  = 2000, vn = 2%");
+      gGener = GeVSimStandard(2000., 2.);
     }
-    break;
-    
+      break;
+      
     case kFlow_10_2000:
     {
-       comment = comment.Append(" Flow with dN/deta  = 2000, vn = 10%");
-       gGener = GeVSimStandard(2000., 10.);
+      comment = comment.Append(" Flow with dN/deta  = 2000, vn = 10%");
+      gGener = GeVSimStandard(2000., 10.);
     }
-    break;
-    
+      break;
+      
     case kFlow_6_2000:
     {
-       comment = comment.Append(" Flow with dN/deta  = 2000, vn = 6%");
-       gGener = GeVSimStandard(2000., 6.);
+      comment = comment.Append(" Flow with dN/deta  = 2000, vn = 6%");
+      gGener = GeVSimStandard(2000., 6.);
     }
-    break;
-    
+      break;
+      
     case kFlow_6_5000:
     {
-       comment = comment.Append(" Flow with dN/deta  = 5000, vn = 6%");
-       gGener = GeVSimStandard(5000., 6.);
+      comment = comment.Append(" Flow with dN/deta  = 5000, vn = 6%");
+      gGener = GeVSimStandard(5000., 6.);
     }
-    break;
+      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 = 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 = 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;
+      //
+      // 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 = 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 = 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 = (AliGenHijing*)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);
+      gener->SetProjectile("A", 208, 82) ; 
+      gener->SetTarget("A", 208, 82) ; 
+      gGener = gener;
     }
-    
-    return gGener;
+      break;
+    default: break;
+  }
+  
+  return gGener;
 }
 
-AliGenHijing* HijingStandard()
+AliGenerator* HijingStandard()
 {
+  
     AliGenHijing *gener = new AliGenHijing(-1);
 // centre of mass energy 
     gener->SetEnergyCMS(5500.);