Changes for #89427: Porting modification for material budget issues to the Release...

[u/mrichter/AliRoot.git] / test / pploadlibs / Config.C

diff --git a/test/pploadlibs/Config.C b/test/pploadlibs/Config.C
index 998b43fb4f2ae0a4ac34a533cba2675bdd489263..69f0d8d204d2196ba74bca4a07628969a00d4dc3 100644 (file)
--- 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,7 +33,7 @@
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
 #include "ITS/AliITSgeom.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -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 //
@@ -186,7 +180,7 @@ void Config()
   gAlice->SetRunLoader(rl);
   
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+  AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
   cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
 
   //
@@ -333,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;
@@ -433,7 +423,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)
@@ -470,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)
@@ -500,7 +491,7 @@ void Config()
 
     if (iPHOS)
     {
-        AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP");
+        AliPHOS *PHOS = new AliPHOSv1("PHOS", "noCPV_Modules123");
     }
 
 
@@ -519,7 +510,7 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_FIRSTYEAR");
     }
 
      if (iACORDE)