X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=test%2FPbPbbench%2FConfig.C;h=d5a5a808f06f8e821b6e51325504d81ea8a96358;hb=a5fd84fbb85335df429320307f56f38501ae1c60;hp=38a16a1bcce29fcaf6e685e9d83be61faf69a35b;hpb=f1e07bdc7f929a6106ffd5b18fb1cf83e196d219;p=u%2Fmrichter%2FAliRoot.git

diff --git a/test/PbPbbench/Config.C b/test/PbPbbench/Config.C
index 38a16a1bcce..d5a5a808f06 100644
--- a/test/PbPbbench/Config.C
+++ b/test/PbPbbench/Config.C
@@ -31,7 +31,7 @@
 #include "EVGEN/AliGenGeVSim.h"
 #include "EVGEN/AliGeVSimParticle.h"
 #include "PYTHIA6/AliGenPythia.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -40,10 +40,10 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSvPPRasymmFMD.h"
+#include "ITS/AliITSv11Hybrid.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv2.h"
+#include "HMPID/AliHMPIDv3.h"
 #include "ZDC/AliZDCv3.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -52,7 +52,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -105,11 +105,6 @@ enum PprRad_t
     kGluonRadiation, kNoGluonRadiation
 };
 
-enum PprMag_t
-{
-    k2kG, k4kG, k5kG
-};
-
 enum PprTrigConf_t
 {
     kDefaultPPTrig, kDefaultPbPbTrig
@@ -119,19 +114,13 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
-
 // This part for configuration    
 
 static PprRun_t srun = kHijing_per2;
 static PprRad_t srad = kGluonRadiation;
-static PprMag_t smag = k5kG;
+static AliMagF::BMap_t smag = AliMagF::k5kG;
 static Int_t    sseed = 12345; //Set 0 to use the current time
 static PprTrigConf_t strig = kDefaultPbPbTrig; // default pp trigger configuration
-static PprGeo_t geo = kHoles;
 
 // Comment line 
 static TString  comment;
@@ -259,11 +248,9 @@ void Config()
     gener->SetTrackingFlag(1);
     gener->Init();
     
-    if (smag == k2kG) {
+    if (smag == AliMagF::k2kG) {
 	comment = comment.Append(" | L3 field 0.2 T");
-    } else if (smag == k4kG) {
-	comment = comment.Append(" | L3 field 0.4 T");
-    } else if (smag == k5kG) {
+    } else if (smag == AliMagF::k5kG) {
 	comment = comment.Append(" | L3 field 0.5 T");
     }
     
@@ -280,10 +267,8 @@ void Config()
     
     
 // Field
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., smag);
-    field->SetL3ConstField(0); //Using const. field in the barrel
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., smag));
     rl->CdGAFile();
-    gAlice->SetField(field);    
 //
     Int_t   iABSO   = 1;
     Int_t   iDIPO   = 1;
@@ -346,11 +331,7 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-        if (geo == kHoles) {
-	  FRAME->SetHoles(1);
-	} else {
-	  FRAME->SetHoles(0);
-	}
+	FRAME->SetHoles(1);
     }
 
     if (iSHIL)
@@ -372,7 +353,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-	AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
+	AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
     }
 
     if (iTPC)
@@ -391,7 +372,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -445,13 +426,13 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
     }
 
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
@@ -1392,7 +1373,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
 	AliGenSTRANGElib *lib = new AliGenSTRANGElib();
 	Int_t particle;
 	// Xi
-	particle = AliGenSTRANGElib::kXiMinus;
+	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);
@@ -1400,7 +1381,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
  
 	//
 	// Omega
-	particle = AliGenSTRANGElib::kOmegaMinus;
+	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);