Extracting Branch and Revision from Git.

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

diff --git a/macros/Config.C b/macros/Config.C
index dcee82aebecbfc3e4fa3614c0b69b182b5e23ce1..e125d9b6e1e94cac6ea20ee4e556bae653f3eba7 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -17,7 +17,7 @@
 #include "PYTHIA6/AliDecayerPythia.h"
 #include "EVGEN/AliGenCocktail.h"
 #include "EVGEN/AliGenHIJINGpara.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -26,11 +26,11 @@
 #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"
-#include "ZDC/AliZDCv3.h"
+#include "ZDC/AliZDCv4.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -38,7 +38,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
 
@@ -89,11 +89,11 @@ void Config()
         cout << "#####################################################" << endl;
         cout << "#                                                   #" << endl;
         cout << "#     WARNING: CDB DEFAULT STORAGE NOT SET !!!      #" << endl;
-        cout << "#     SETTING IT TO local://$ALICE_ROOT !!!         #" << endl;
+        cout << "#     SETTING IT TO local://$ALICE_ROOT/OCDB !!!         #" << endl;
         cout << "#                                                   #" << endl;
         cout << "#####################################################" << endl;
           
-         AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+         AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     }
     
     if(AliCDBManager::Instance()->GetRun() < 0){
@@ -111,7 +111,7 @@ void Config()
     // Uncomment if you want to load geometry from OCDB!   <<<<
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //
@@ -190,31 +190,29 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., 1);
-    gAlice->SetField(field);    
-
-
-    Int_t   iABSO  =  1;
-    Int_t   iDIPO  =  1;
-    Int_t   iFMD   =  1;
-    Int_t   iFRAME =  1;
-    Int_t   iHALL  =  1;
-    Int_t   iITS   =  1;
-    Int_t   iMAG   =  1;
-    Int_t   iMUON  =  1;
-    Int_t   iPHOS  =  1;
-    Int_t   iPIPE  =  1;
-    Int_t   iPMD   =  1;
-    Int_t   iHMPID  =  1;
-    Int_t   iSHIL  =  1;
-    Int_t   iT0 =  1;
-    Int_t   iTOF   =  1;
-    Int_t   iTPC   =  1;
-    Int_t   iTRD   =  1;
-    Int_t   iZDC   =  1;
-    Int_t   iEMCAL =  1;
-    Int_t   iACORDE   =  0;
-    Int_t   iVZERO =  1;
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG));
+
+    Int_t   iABSO   = 1;
+    Int_t   iDIPO   = 1;
+    Int_t   iFMD    = 1;
+    Int_t   iFRAME  = 1;
+    Int_t   iHALL   = 1;
+    Int_t   iITS    = 1;
+    Int_t   iMAG    = 1;
+    Int_t   iMUON   = 1;
+    Int_t   iPHOS   = 1;
+    Int_t   iPIPE   = 1;
+    Int_t   iPMD    = 1;
+    Int_t   iHMPID  = 1;
+    Int_t   iSHIL   = 1;
+    Int_t   iT0     = 1;
+    Int_t   iTOF    = 1;
+    Int_t   iTPC    = 1;
+    Int_t   iTRD    = 1;
+    Int_t   iZDC    = 1;
+    Int_t   iEMCAL  = 1;
+    Int_t   iACORDE = 1;
+    Int_t   iVZERO  = 1;
     rl->CdGAFile();
     //=================== Alice BODY parameters =============================
     AliBODY *BODY = new AliBODY("BODY", "Alice envelop");
@@ -276,7 +274,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)
@@ -304,7 +302,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv4("ZDC", "normal ZDC");
     }
 
     if (iTRD)
@@ -349,18 +347,18 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE12SMV1");
     }
 
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
     {
-        //=================== ACORDE parameters ============================
+        //=================== VZERO parameters ============================
         AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO");
     }