X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=test%2Fpploadlibs%2FConfig.C;h=d306804867aee73049db9db543b821e27d5b2a8f;hb=7da2a4e8e40108679acfc78cd31d1616e7446b87;hp=36b891e3bad8e81ec204182753d1eebcf36e0552;hpb=e89fa83b9eadc4ac896b20b74628e5c9f9a13c25;p=u%2Fmrichter%2FAliRoot.git

diff --git a/test/pploadlibs/Config.C b/test/pploadlibs/Config.C
index 36b891e3bad..d306804867a 100644
--- a/test/pploadlibs/Config.C
+++ b/test/pploadlibs/Config.C
@@ -23,7 +23,7 @@
 #include "STEER/AliConfig.h"
 #include "PYTHIA6/AliDecayerPythia.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"
@@ -33,11 +33,11 @@
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
 #include "ITS/AliITSgeom.h"
-#include "ITS/AliITSvPPRasymmFMD.h"
+#include "ITS/AliITSv11Hybrid.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv2.h"
-#include "ZDC/AliZDCv2.h"
+#include "HMPID/AliHMPIDv3.h"
+#include "ZDC/AliZDCv3.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -45,7 +45,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
 
@@ -80,12 +80,6 @@ enum YCut_t
 {
   kFull, kBarrel, kMuonArm
 };
-//--- Magnetic Field ---
-enum Mag_t
-{
-    k2kG, k4kG, k5kG
-};
-
 //--- Trigger config ---
 enum TrigConf_t
 {
@@ -106,7 +100,7 @@ void ProcessEnvironmentVars();
 static PDC06Proc_t   proc     = kPyMbNoHvq;
 static DecayHvFl_t   decHvFl  = kNature; 
 static YCut_t        ycut     = kFull;
-static Mag_t         mag      = k5kG; 
+static AliMagF::BMap_t mag    = AliMagF::k5kG; 
 static TrigConf_t    trig     = kDefaultPPTrig; // default pp trigger configuration
 //========================//
 // Set Random Number seed //
@@ -157,6 +151,10 @@ void Config()
 
   // libraries required by geant321
 #if defined(__CINT__)
+  gSystem->Load("liblhapdf");
+  gSystem->Load("libEGPythia6");
+  gSystem->Load("libpythia6");
+  gSystem->Load("libAliPythia6");
   gSystem->Load("libgeant321");
 #endif
 
@@ -329,21 +327,17 @@ void Config()
 
   // FIELD
   //    
-  if (mag == k2kG) {
+  if (mag == AliMagF::k2kG) {
     comment = comment.Append(" | L3 field 0.2 T");
-  } else if (mag == k4kG) {
-    comment = comment.Append(" | L3 field 0.4 T");
-  } else if (mag == k5kG) {
+  } else if (mag == AliMagF::k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
     
-  AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., mag);
-  field->SetL3ConstField(0); //Using const. field in the barrel
+  AliMagF* field = new AliMagF("Maps","Maps", -1., -1., mag);
+  TGeoGlobalMagField::Instance()->SetField(field);
+  
   rl->CdGAFile();
-  gAlice->SetField(field);    
-
-
 
   Int_t iABSO  = 1;
   Int_t iACORDE   = 0;
@@ -407,6 +401,7 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
+	FRAME->SetHoles(1);
     }
 
     if (iSHIL)
@@ -428,7 +423,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)
@@ -441,20 +436,13 @@ void Config()
     if (iTOF) {
         //=================== TOF parameters ============================
 	AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF");
-	// Partial geometry: modules at 2,3,4,6,7,11,12,14,15,16
-	// starting at 6h in positive direction
-	//	Int_t TOFSectors[18]={-1,-1,0,0,0,-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0};
-	// Partial geometry: modules at 1,2,6,7,9,10,11,12,15,16,17
-	// (ALICE numbering convention)
-       	Int_t TOFSectors[18]={-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0,-1,-1,0,0,0};
-	TOF->SetTOFSectors(TOFSectors);
     }
 
 
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -463,7 +451,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv2("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
     }
 
     if (iTRD)
@@ -472,18 +460,19 @@ void Config()
 
         AliTRD *TRD = new AliTRDv1("TRD", "TRD slow simulator");
         AliTRDgeometry *geoTRD = TRD->GetGeometry();
-	// Partial geometry: modules at 2,3,4,6,11,12,14,15
-	// starting at 6h in positive direction
-	geoTRD->SetSMstatus(0,0);
-        geoTRD->SetSMstatus(1,0);
+	// Partial geometry: modules at 0,1,7,8,9,10,17
+	// starting at 3h in positive direction
+	geoTRD->SetSMstatus(2,0);
+	geoTRD->SetSMstatus(3,0);
+	geoTRD->SetSMstatus(4,0);
         geoTRD->SetSMstatus(5,0);
-        geoTRD->SetSMstatus(7,0);
-        geoTRD->SetSMstatus(8,0);
-        geoTRD->SetSMstatus(9,0);
-        geoTRD->SetSMstatus(10,0);
+	geoTRD->SetSMstatus(6,0);
+        geoTRD->SetSMstatus(11,0);
+        geoTRD->SetSMstatus(12,0);
         geoTRD->SetSMstatus(13,0);
+        geoTRD->SetSMstatus(14,0);
+        geoTRD->SetSMstatus(15,0);
         geoTRD->SetSMstatus(16,0);
-        geoTRD->SetSMstatus(17,0);
     }
 
     if (iFMD)
@@ -521,13 +510,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)