]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - test/PbPbbench/Config.C
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Root6-enabled version
[u/mrichter/AliRoot.git] / test / PbPbbench / Config.C
diff --git a/test/PbPbbench/Config.C b/test/PbPbbench/Config.C
index b7244385605255100d64ff45b0106a5942148735..b4a346d1848be6e0336fbbba2b00ced9cb572aae 100644 (file)
--- a/test/PbPbbench/Config.C
+++ b/test/PbPbbench/Config.C
@@ -1,60 +1,4 @@
-// One can use the configuration macro in compiled mode by
-// root [0] gSystem->Load("libgeant321");
-// root [0] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\
-//                   -I$ALICE_ROOT -I$ALICE/geant3/TGeant3");
-// root [0] .x grun.C(1,"ConfigPPR.C++")
-
-#if !defined(__CINT__) || defined(__MAKECINT__)
-#include <Riostream.h>
-#include <TRandom.h>
-#include <TSystem.h>
-#include <TVirtualMC.h>
-#include <TGeant3TGeo.h>
-#include <TPDGCode.h>
-#include <TF1.h>
-#include "STEER/AliRunLoader.h"
-#include "STEER/AliRun.h"
-#include "STEER/AliConfig.h"
-#include "STEER/AliGenerator.h"
-#include "STEER/AliLog.h"
-#include "PYTHIA6/AliDecayerPythia.h"
-#include "EVGEN/AliGenHIJINGpara.h"
-#include "THijing/AliGenHijing.h"
-#include "EVGEN/AliGenCocktail.h"
-#include "EVGEN/AliGenSlowNucleons.h"
-#include "EVGEN/AliSlowNucleonModelExp.h"
-#include "EVGEN/AliGenParam.h"
-#include "EVGEN/AliGenMUONlib.h"
-#include "EVGEN/AliGenSTRANGElib.h"
-#include "EVGEN/AliGenMUONCocktail.h"
-#include "EVGEN/AliGenCocktail.h"
-#include "EVGEN/AliGenGeVSim.h"
-#include "EVGEN/AliGeVSimParticle.h"
-#include "PYTHIA6/AliGenPythia.h"
-#include "STEER/AliMagF.h"
-#include "STRUCT/AliBODY.h"
-#include "STRUCT/AliMAG.h"
-#include "STRUCT/AliABSOv3.h"
-#include "STRUCT/AliDIPOv3.h"
-#include "STRUCT/AliHALLv3.h"
-#include "STRUCT/AliFRAMEv2.h"
-#include "STRUCT/AliSHILv3.h"
-#include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
-#include "TPC/AliTPCv2.h"
-#include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv3.h"
-#include "ZDC/AliZDCv3.h"
-#include "TRD/AliTRDv1.h"
-#include "FMD/AliFMDv1.h"
-#include "MUON/AliMUONv1.h"
-#include "PHOS/AliPHOSv1.h"
-#include "PMD/AliPMDv1.h"
-#include "T0/AliT0v1.h"
-#include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv1.h"
-#include "VZERO/AliVZEROv7.h"
-#endif
+//Configuration of simulation
 
 enum PprRun_t 
 {
@@ -119,6 +63,8 @@ const char * pprTrigConfName[] = {
 static PprRun_t srun = kHijing_per2;
 static PprRad_t srad = kGluonRadiation;
 static AliMagF::BMap_t smag = AliMagF::k5kG;
+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
 
@@ -145,19 +91,14 @@ void Config()
     cout<<"Seed for random number generation= "<<gRandom->GetSeed()<<endl; 
 
 
-   // libraries required by geant321
-#if defined(__CINT__)
-    gSystem->Load("liblhapdf");
-    gSystem->Load("libEGPythia6");
-    gSystem->Load("libpythia6");
-    gSystem->Load("libAliPythia6");
-    gSystem->Load("libgeant321");
-#endif
+   // libraries required by geant321 and Pythia: loaded in sim.C
 
     new     TGeant3TGeo("C++ Interface to Geant3");
 
+    TVirtualMC * vmc = TVirtualMC::GetMC();
+
   // Output every 100 tracks
-  ((TGeant3*)gMC)->SetSWIT(4,100);
+  ((TGeant3*)vmc)->SetSWIT(4,100);
 
     AliRunLoader* rl=0x0;
 
@@ -176,7 +117,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //
@@ -199,7 +140,7 @@ void Config()
       break;
     }
     decayer->Init();
-    gMC->SetExternalDecayer(decayer);
+    vmc->SetExternalDecayer(decayer);
     //
     //
     //=======================================================================
@@ -209,35 +150,35 @@ void Config()
     // --- Specify event type to be tracked through the ALICE setup
     // --- All positions are in cm, angles in degrees, and P and E in GeV
 
-    gMC->SetProcess("DCAY",1);
-    gMC->SetProcess("PAIR",1);
-    gMC->SetProcess("COMP",1);
-    gMC->SetProcess("PHOT",1);
-    gMC->SetProcess("PFIS",0);
-    gMC->SetProcess("DRAY",0);
-    gMC->SetProcess("ANNI",1);
-    gMC->SetProcess("BREM",1);
-    gMC->SetProcess("MUNU",1);
-    gMC->SetProcess("CKOV",1);
-    gMC->SetProcess("HADR",1);
-    gMC->SetProcess("LOSS",2);
-    gMC->SetProcess("MULS",1);
-    gMC->SetProcess("RAYL",1);
+    vmc->SetProcess("DCAY",1);
+    vmc->SetProcess("PAIR",1);
+    vmc->SetProcess("COMP",1);
+    vmc->SetProcess("PHOT",1);
+    vmc->SetProcess("PFIS",0);
+    vmc->SetProcess("DRAY",0);
+    vmc->SetProcess("ANNI",1);
+    vmc->SetProcess("BREM",1);
+    vmc->SetProcess("MUNU",1);
+    vmc->SetProcess("CKOV",1);
+    vmc->SetProcess("HADR",1);
+    vmc->SetProcess("LOSS",2);
+    vmc->SetProcess("MULS",1);
+    vmc->SetProcess("RAYL",1);
 
     Float_t cut = 1.e-3;        // 1MeV cut by default
     Float_t tofmax = 1.e10;
 
-    gMC->SetCut("CUTGAM", cut);
-    gMC->SetCut("CUTELE", cut);
-    gMC->SetCut("CUTNEU", cut);
-    gMC->SetCut("CUTHAD", cut);
-    gMC->SetCut("CUTMUO", cut);
-    gMC->SetCut("BCUTE",  cut); 
-    gMC->SetCut("BCUTM",  cut); 
-    gMC->SetCut("DCUTE",  cut); 
-    gMC->SetCut("DCUTM",  cut); 
-    gMC->SetCut("PPCUTM", cut);
-    gMC->SetCut("TOFMAX", tofmax); 
+    vmc->SetCut("CUTGAM", cut);
+    vmc->SetCut("CUTELE", cut);
+    vmc->SetCut("CUTNEU", cut);
+    vmc->SetCut("CUTHAD", cut);
+    vmc->SetCut("CUTMUO", cut);
+    vmc->SetCut("BCUTE",  cut); 
+    vmc->SetCut("BCUTM",  cut); 
+    vmc->SetCut("DCUTE",  cut); 
+    vmc->SetCut("DCUTM",  cut); 
+    vmc->SetCut("PPCUTM", cut);
+    vmc->SetCut("TOFMAX", tofmax); 
 
     // Generator Configuration
     AliGenerator* gener = GeneratorFactory(srun);
@@ -267,7 +208,8 @@ void Config()
     
     
 // Field
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, -1., -1., 10., smag));
+    TGeoGlobalMagField::Instance()->SetField
+      (new AliMagF("Maps","Maps", -1., -1., smag,beamType,beamEnergy));
     rl->CdGAFile();
 //
     Int_t   iABSO   = 1;
@@ -353,7 +295,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)
@@ -381,7 +323,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
@@ -426,7 +368,7 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETEV1");
     }
 
      if (iACORDE)
@@ -1426,7 +1368,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       Int_t particle;
       // Xi
       particle = kXiMinus;
-      AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
+      AliGenParam *genXi = new AliGenParam(16,lib,particle);
       genXi->SetPtRange(0., 12.);
       genXi->SetYRange(-1.1, 1.1);
       genXi->SetForceDecay(kNoDecay);  
@@ -1434,7 +1376,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
       //
       // Omega
       particle = kOmegaMinus;
-      AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
+      AliGenParam *genOmega = new AliGenParam(10,lib,particle);
       genOmega->SetPtRange(0, 12.);
       genOmega->SetYRange(-1.1, 1.1);
       genOmega->SetForceDecay(kNoDecay);
@@ -1464,6 +1406,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
 
 AliGenHijing* HijingStandard()
 {
+  
     AliGenHijing *gener = new AliGenHijing(-1);
 // centre of mass energy 
     gener->SetEnergyCMS(5500.);