Possibilty to load the geometry either from an external root file or from CDB (Raffaele)

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

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index cc3ae5bc4fc2061ed4a106b932fe9aac18936c9e..ffa611f76a9e737a1b7f5417a7ce1863b538f155 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -34,15 +34,15 @@
 #include "STEER/AliMagFMaps.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
-#include "STRUCT/AliABSOv0.h"
-#include "STRUCT/AliDIPOv2.h"
-#include "STRUCT/AliHALL.h"
+#include "STRUCT/AliABSOv3.h"
+#include "STRUCT/AliDIPOv3.h"
+#include "STRUCT/AliHALLv3.h"
 #include "STRUCT/AliFRAMEv2.h"
-#include "STRUCT/AliSHILv2.h"
-#include "STRUCT/AliPIPEv0.h"
+#include "STRUCT/AliSHILv3.h"
+#include "STRUCT/AliPIPEv3.h"
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
-#include "TOF/AliTOFv5T0.h"
+#include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv1.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
@@ -158,6 +158,11 @@ void Config()
 
     new     TGeant3TGeo("C++ Interface to Geant3");
 
+    if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetRun(0);
+    }
+
     AliRunLoader* rl=0x0;
 
     AliLog::Message(AliLog::kInfo, "Creating Run Loader", "", "", "Config()"," ConfigPPR.C", __LINE__);
@@ -173,6 +178,8 @@ void Config()
     rl->SetCompressionLevel(2);
     rl->SetNumberOfEventsPerFile(3);
     gAlice->SetRunLoader(rl);
+    // gAlice->SetGeometryFromFile("geometry.root");
+    // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
     gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
@@ -315,21 +322,21 @@ void Config()
     if (iABSO)
     {
         //=================== ABSO parameters ============================
-        AliABSO *ABSO = new AliABSOv0("ABSO", "Muon Absorber");
+        AliABSO *ABSO = new AliABSOv3("ABSO", "Muon Absorber");
     }
 
     if (iDIPO)
     {
         //=================== DIPO parameters ============================
 
-        AliDIPO *DIPO = new AliDIPOv2("DIPO", "Dipole version 2");
+        AliDIPO *DIPO = new AliDIPOv3("DIPO", "Dipole version 3");
     }
 
     if (iHALL)
     {
         //=================== HALL parameters ============================
 
-        AliHALL *HALL = new AliHALL("HALL", "Alice Hall");
+        AliHALL *HALL = new AliHALLv3("HALL", "Alice Hall");
     }
 
 
@@ -344,7 +351,7 @@ void Config()
     {
         //=================== SHIL parameters ============================
 
-        AliSHIL *SHIL = new AliSHILv2("SHIL", "Shielding Version 2");
+        AliSHIL *SHIL = new AliSHILv3("SHIL", "Shielding Version 3");
     }
 
 
@@ -352,7 +359,7 @@ void Config()
     {
         //=================== PIPE parameters ============================
 
-        AliPIPE *PIPE = new AliPIPEv0("PIPE", "Beam Pipe");
+        AliPIPE *PIPE = new AliPIPEv3("PIPE", "Beam Pipe");
     }
  
     if(iITS) {
@@ -420,7 +427,7 @@ void Config()
 
     if (iTOF) {
         //=================== TOF parameters ============================
-       AliTOF *TOF = new AliTOFv5T0("TOF", "normal TOF");
+       AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF");
     }
 
 
@@ -492,7 +499,7 @@ void Config()
 
      if (iVZERO)
     {
-        //=================== ACORDE parameters ============================
+        //=================== VZERO parameters ============================
         AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO");
     }