Using the default ITS settings in the configuration files (Bjorn)

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

diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C
index 3aa00ea1240777476a54df4c94c416db65640412..3c5728322974c6b246017fc9daa6b726666de987 100644 (file)
--- a/macros/ConfigBeautyPPR.C
+++ b/macros/ConfigBeautyPPR.C
@@ -13,16 +13,16 @@
 #include "STEER/AliMagFCM.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/AliITSvPPRasymm.h"
 #include "TPC/AliTPCv2.h"
-#include "TOF/AliTOFv5T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "TOF/AliTOFv6T0.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv1.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.h"
@@ -57,6 +57,11 @@ void Config()
   //=======================================================================
   //  Create the output file
    
+  if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
+    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+    AliCDBManager::Instance()->SetRun(0);
+  }
+  
   AliRunLoader* rl=0x0;
 
   cout<<"Config.C: Creating Run Loader ..."<<endl;
@@ -71,6 +76,8 @@ void Config()
   rl->SetCompressionLevel(2);
   rl->SetNumberOfEventsPerFile(3);
   gAlice->SetRunLoader(rl);
+  // gAlice->SetGeometryFromFile("geometry.root");
+  // gAlice->SetGeometryFromCDB();
 
   // Set the trigger configuration
   gAlice->SetTriggerDescriptor("Pb-Pb");
@@ -193,19 +200,19 @@ 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");
   }
 
 
@@ -219,71 +226,21 @@ void Config()
   if(iSHIL) {
     //=================== SHIL parameters ============================
 
-    AliSHIL *SHIL  = new AliSHILv2("SHIL","Shielding");
+    AliSHIL *SHIL  = new AliSHILv3("SHIL","Shielding");
   }
 
 
   if(iPIPE) {
     //=================== PIPE parameters ============================
 
-    AliPIPE *PIPE  = new AliPIPEv0("PIPE","Beam Pipe");
+    AliPIPE *PIPE  = new AliPIPEv3("PIPE","Beam Pipe");
   }
 
 
   if(iITS) {
+    //=================== ITS parameters ============================
 
-//=================== ITS parameters ============================
-    //
-    // As the innermost detector in ALICE, the Inner Tracking System "impacts" on
-    // almost all other detectors. This involves the fact that the ITS geometry
-    // still has several options to be followed in parallel in order to determine
-    // the best set-up which minimizes the induced background. All the geometries
-    // available to date are described in the following. Read carefully the comments
-    // and use the default version (the only one uncommented) unless you are making
-    // comparisons and you know what you are doing. In this case just uncomment the
-    // ITS geometry you want to use and run Aliroot.
-    //
-    // Detailed geometries:         
-    //
-    //
-    //AliITS *ITS  = new AliITSv5symm("ITS","Updated ITS TDR detailed version with symmetric services");
-    //
-    //AliITS *ITS  = new AliITSv5asymm("ITS","Updates ITS TDR detailed version with asymmetric services");
-    //
     AliITSvPPRasymm *ITS  = new AliITSvPPRasymm("ITS","New ITS PPR detailed version with asymmetric services");
-    ITS->SetMinorVersion(2);                                         // don't touch this parameter if you're not an ITS developer
-    ITS->SetReadDet(kFALSE);                                         // don't touch this parameter if you're not an ITS developer
-    ITS->SetWriteDet("$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.det");  // don't touch this parameter if you're not an ITS developer
-    ITS->SetThicknessDet1(200.);   // detector thickness on layer 1 must be in the range [150,300]
-    ITS->SetThicknessDet2(200.);   // detector thickness on layer 2 must be in the range [150,300]
-    ITS->SetThicknessChip1(150.);  // chip thickness on layer 1 must be in the range [100,300]
-    ITS->SetThicknessChip2(150.);  // chip thickness on layer 2 must be in the range [100,300]
-    ITS->SetRails(1);             // 1 --> rails in ; 0 --> rails out
-    ITS->SetCoolingFluid(1);       // 1 --> water ; 0 --> freon
-    //
-    // Coarse geometries (warning: no hits are produced with these coarse geometries and they unuseful 
-    // for reconstruction !):
-    //                                                     
-    //
-    //AliITSvPPRcoarseasymm *ITS  = new AliITSvPPRcoarseasymm("ITS","New ITS PPR coarse version with asymmetric services");
-    //ITS->SetRails(1);                // 1 --> rails in ; 0 --> rails out
-    //ITS->SetSupportMaterial(0);      // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon
-    //
-    //AliITS *ITS  = new AliITSvPPRcoarsesymm("ITS","New ITS PPR coarse version with symmetric services");
-    //ITS->SetRails(1);                // 1 --> rails in ; 0 --> rails out
-    //ITS->SetSupportMaterial(0);      // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon
-    //                      
-    //
-    //
-    // Geant3 <-> EUCLID conversion
-    // ============================
-    //
-    // SetEUCLID is a flag to output (=1) or not to output (=0) both geometry and
-    // media to two ASCII files (called by default ITSgeometry.euc and
-    // ITSgeometry.tme) in a format understandable to the CAD system EUCLID.
-    // The default (=0) means that you dont want to use this facility.
-    //
-    ITS->SetEUCLID(0);  
   }
   
 
@@ -295,12 +252,12 @@ void Config()
 
   if(iTOF) {
     //=================== TOF parameters ============================
-    AliTOF *TOF  = new AliTOFv5T0("TOF","normal TOF");
+    AliTOF *TOF  = new AliTOFv6T0("TOF","normal TOF");
   }
 
   if(iHMPID) {
     //=================== HMPID parameters ===========================
-    AliHMPID *HMPID  = new AliHMPIDv1("HMPID","normal HMPID");    
+    AliHMPID *HMPID  = new AliHMPIDv2("HMPID","normal HMPID");    
 
   }