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

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

diff --git a/test/embedding/Config.C b/test/embedding/Config.C
index e96e7813bfde53669adbb172a553c2eebaf59945..145f9bcac92f2768ccf066ac92bd2df94af7ce2d 100644 (file)
--- a/test/embedding/Config.C
+++ b/test/embedding/Config.C
@@ -30,7 +30,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -145,12 +145,12 @@ void Config()
   
   // Set the trigger configuration
   if ((embedrun == kBackground) || (embedrun == kMerged)) {
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
   }
   else {
     // Set the trigger configuration: proton-proton
-    gAlice->SetTriggerDescriptor("p-p");
+    AliSimulation::Instance()->SetTriggerConfig("p-p");
   }
 
   //
@@ -284,12 +284,10 @@ void Config()
     //  AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    //    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k2kG);
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform));
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::kNoField));
-//     field = new AliMagFCheb("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG);
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   //  TGeoGlobalMagField::Instance()->SetField(field);
@@ -380,7 +378,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)
@@ -460,7 +458,7 @@ void Config()
     {
         //=================== EMCAL parameters ============================
 
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETEV1");
     }
 
      if (iACORDE)