This is a backward incompatible change in AliRoot. The following methods have been...

[u/mrichter/AliRoot.git] / test / genkine / sim / Config.C

diff --git a/test/genkine/sim/Config.C b/test/genkine/sim/Config.C
index 5ecbc3997aac479d55bf5c67ad7f2f6127b98e8b..2a52f5d2e118c906e13bfcdddbffefbcc4234c3f 100644 (file)
--- a/test/genkine/sim/Config.C
+++ b/test/genkine/sim/Config.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,10 +40,10 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSvPPRasymmFMD.h"
+#include "ITS/AliITSv11Hybrid.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv2.h"
+#include "HMPID/AliHMPIDv3.h"
 #include "ZDC/AliZDCv3.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
@@ -53,7 +53,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"
 #include "EVGEN/AliGenExtFile.h"
 #include "EVGEN/AliGenReaderTreeK.h"
@@ -64,11 +64,6 @@ enum PprRad_t
     kGluonRadiation, kNoGluonRadiation
 };
 
-enum PprMag_t
-{
-    k2kG, k4kG, k5kG
-};
-
 enum PprTrigConf_t
 {
     kDefaultPPTrig, kDefaultPbPbTrig
@@ -78,10 +73,11 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
+
 // This part for configuration    
 
 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 PbPb trigger configuration
@@ -103,8 +99,12 @@ void Config()
   
 
 
-   // libraries required by geant321
+   // libraries required by geant321 and Pythia6
 #if defined(__CINT__)
+    gSystem->Load("liblhapdf.so");      // Parton density functions
+    gSystem->Load("libEGPythia6.so");   // TGenerator interface
+    gSystem->Load("libpythia6.so");     // Pythia
+    gSystem->Load("libAliPythia6.so");  // ALICE specific implementations
     gSystem->Load("libgeant321");
 #endif
 
@@ -126,7 +126,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
   // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
 
@@ -138,14 +138,14 @@ void Config()
 
     //forbid some decays
     AliPythia * py= AliPythia::Instance();
-    py->SetMDME(731,1,0); //forbid D*+->D+ + pi0
-    py->SetMDME(732,1,0);//forbid D*+->D+ + gamma
+    py->SetMDME(737,1,0); //forbid D*+->D+ + pi0
+    py->SetMDME(738,1,0);//forbid D*+->D+ + gamma
 
-    for(Int_t d=741; d<=756; d++){ 
+    for(Int_t d=747; d<=762; d++){ 
       py->SetMDME(d,1,0);
     }
 
-    for(Int_t d=758; d<=801; d++){ 
+    for(Int_t d=764; d<=807; d++){ 
       py->SetMDME(d,1,0);
     }
 
@@ -204,11 +204,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");
     }
     
@@ -226,11 +224,11 @@ void Config()
     
     
 // Field (L3 0.4 T)
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., smag);
-    field->SetL3ConstField(0); //Using const. field in the barrel
+    AliMagF* field = new AliMagF("Maps","Maps",-1., -1., smag);
+    TGeoGlobalMagField::Instance()->SetField(field);
+
     rl->CdGAFile();
-    gAlice->SetField(field);    
-//
+    //
     Int_t   iABSO   = 1;
     Int_t   iDIPO   = 1;
     Int_t   iFMD    = 1;
@@ -292,6 +290,7 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
+       FRAME->SetHoles(1);
     }
 
     if (iSHIL)
@@ -313,7 +312,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
+       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
     }
 
     if (iTPC)
@@ -332,7 +331,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -386,13 +385,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)