Moving PWG1 to PWGPP

[u/mrichter/AliRoot.git] / macros / Config_AliGenCosmicsParam.C

diff --git a/macros/Config_AliGenCosmicsParam.C b/macros/Config_AliGenCosmicsParam.C
index b56c526013f300d70c8e6ba839ef01c7d8646685..5deab168c4ed75b99234179f94146a5d0b778ed3 100644 (file)
--- a/macros/Config_AliGenCosmicsParam.C
+++ b/macros/Config_AliGenCosmicsParam.C
@@ -17,7 +17,7 @@
 #include "EVGEN/AliGenCocktail.h"
 #include "EVGEN/AliGenCosmicsParam.h"
 #include "EVGEN/AliGenHIJINGpara.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv0.h"
@@ -26,7 +26,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv2.h"
 #include "STRUCT/AliPIPEv0.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv5T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -38,19 +38,13 @@
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
-//--- Magnetic Field ---
-enum Mag_t
-{
-    k2kG, k4kG, k5kG
-};
-
 Float_t EtaToTheta(Float_t arg);
 
-static Mag_t         mag      = k5kG; 
+static AliMagF::BMap_t mag = AliMagF::k5kG; 
 
 void Config()
 {
@@ -83,7 +77,7 @@ void Config()
     new     TGeant3TGeo("C++ Interface to Geant3");
 
     if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
       AliCDBManager::Instance()->SetRun(0);
     }
 
@@ -106,8 +100,8 @@ void Config()
     // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
-    //    gAlice->SetTriggerDescriptor("Pb-Pb");
-    gAlice->SetTriggerDescriptor("ACORDE");
+    //    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("ACORDE");
     cout<<"Trigger configuration is set to  ACORDE"<<endl;
 
     //
@@ -166,12 +160,11 @@ void Config()
     gGener = gener;
 
     // MAGNETIC FIELD IN THE BARREL
-    // AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., mag); // FIELD
-        AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 0., 10., mag); // NO FIELD
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1., mag);
     field->SetL3ConstField(0); //Using const. field in the barrel
-    rl->CdGAFile();
-    gAlice->SetField(field);    
+    TGeoGlobalMagField::Instance()->SetField(field);
 
+    rl->CdGAFile();
 
     Int_t   iABSO  =  1;
     Int_t   iDIPO  =  0;
@@ -255,7 +248,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)
@@ -328,13 +321,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)