config time calib

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

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index 3f1a148cdba84e1b63a382f2f9b363bb8b4636d1..6babd08e355deb7dd05314dbdb192f3122d8c54a 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -31,7 +31,7 @@
 #include "EVGEN/AliGenGeVSim.h"
 #include "EVGEN/AliGeVSimParticle.h"
 #include "PYTHIA6/AliGenPythia.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -40,7 +40,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"
@@ -52,7 +52,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
 
@@ -105,11 +105,6 @@ enum PprRad_t
     kGluonRadiation, kNoGluonRadiation
 };
 
-enum PprMag_t
-{
-    k2kG, k4kG, k5kG
-};
-
 enum PprTrigConf_t
 {
     kDefaultPPTrig, kDefaultPbPbTrig
@@ -123,7 +118,7 @@ const char * pprTrigConfName[] = {
 //static PprRun_t srun = test50;
 static PprRun_t srun  = kHIJINGplus;
 static PprRad_t srad  = kGluonRadiation;
-static PprMag_t smag  = k5kG;
+static AliMagF::BMap_t smag  = AliMagF::k5kG;
 static Int_t    sseed = 12345; //Set 0 to use the current time
 //static PprTrigConf_t strig = kDefaultPPTrig; // default pp trigger configuration
 static PprTrigConf_t strig = kDefaultPbPbTrig; // default PbPb trigger configuration
@@ -162,7 +157,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);
     }
 
@@ -185,7 +180,7 @@ void Config()
     // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //
@@ -261,11 +256,9 @@ void Config()
     gener->SetTrackingFlag(1);
     gener->Init();
     
-    if (smag == k2kG) {
+    if (smag == AliMagF::k2kG) {
        comment = comment.Append(" | L3 field 0.2 T");
-    } else if (smag == k4kG) {
-       comment = comment.Append(" | L3 field 0.4 T");
-    } else if (smag == k5kG) {
+    } else if (smag == AliMagF::k5kG) {
        comment = comment.Append(" | L3 field 0.5 T");
     }
     
@@ -282,10 +275,11 @@ void Config()
     
     
 // Field (L3 0.4 T)
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., smag);
+    AliMagF* field = new AliMagF("Maps","Maps", 1., 1., smag);
     field->SetL3ConstField(0); //Using const. field in the barrel
+    TGeoGlobalMagField::Instance()->SetField(field);
+
     rl->CdGAFile();
-    gAlice->SetField(field);    
 //
     Int_t   iABSO   = 1;
     Int_t   iDIPO   = 1;
@@ -370,7 +364,7 @@ void Config()
     {
        //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)
@@ -443,13 +437,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)
@@ -1390,7 +1384,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        AliGenSTRANGElib *lib = new AliGenSTRANGElib();
        Int_t particle;
        // Xi
-       particle = AliGenSTRANGElib::kXiMinus;
+       particle = kXiMinus;
        AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));
        genXi->SetPtRange(0., 12.);
        genXi->SetYRange(-1.1, 1.1);
@@ -1398,7 +1392,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
  
        //
        // Omega
-       particle = AliGenSTRANGElib::kOmegaMinus;
+       particle = kOmegaMinus;
        AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle));     
        genOmega->SetPtRange(0, 12.);
        genOmega->SetYRange(-1.1, 1.1);