X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=macros%2FConfig_AliGenCosmicsParam.C;h=5deab168c4ed75b99234179f94146a5d0b778ed3;hb=87f615d8f35622afa5b37e5078a900d34caf82e1;hp=0a36406b8b98c252aecc23d761215bcc02fc408b;hpb=6b612c2da5d841214af8ea5e2a0c0e82946ffe6e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/macros/Config_AliGenCosmicsParam.C b/macros/Config_AliGenCosmicsParam.C
index 0a36406b8b9..5deab168c4e 100644
--- a/macros/Config_AliGenCosmicsParam.C
+++ b/macros/Config_AliGenCosmicsParam.C
@@ -17,7 +17,7 @@
 #include "EVGEN/AliGenCocktail.h"
 #include "EVGEN/AliGenCosmicsParam.h"
 #include "EVGEN/AliGenHIJINGpara.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv0.h"
@@ -26,11 +26,11 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv2.h"
 #include "STRUCT/AliPIPEv0.h"
-#include "ITS/AliITSvPPRasymmFMD.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv5T0.h"
-#include "HMPID/AliHMPIDv1.h"
-#include "ZDC/AliZDCv2.h"
+#include "HMPID/AliHMPIDv3.h"
+#include "ZDC/AliZDCv3.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -38,25 +38,13 @@
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
-//--- Magnetic Field ---
-enum Mag_t
-{
-    k2kG, k4kG, k5kG
-};
-
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
-
 Float_t EtaToTheta(Float_t arg);
 
-static Mag_t         mag      = k5kG; 
-static PprGeo_t      geo      = kHoles;
+static AliMagF::BMap_t mag = AliMagF::k5kG; 
 
 void Config()
 {
@@ -89,7 +77,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);
     }
 
@@ -112,8 +100,8 @@ void Config()
     // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
-    //    gAlice->SetTriggerDescriptor("Pb-Pb");
-    gAlice->SetTriggerDescriptor("ACORDE");
+    //    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("ACORDE");
     cout<<"Trigger configuration is set to  ACORDE"<<endl;
 
     //
@@ -172,12 +160,11 @@ void Config()
     gGener = gener;
 
     // MAGNETIC FIELD IN THE BARREL
-    // AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., mag); // FIELD
-        AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 0., 10., mag); // NO FIELD
+    AliMagF* field = new AliMagF("Maps","Maps",1.,1., mag);
     field->SetL3ConstField(0); //Using const. field in the barrel
-    rl->CdGAFile();
-    gAlice->SetField(field);    
+    TGeoGlobalMagField::Instance()->SetField(field);
 
+    rl->CdGAFile();
 
     Int_t   iABSO  =  1;
     Int_t   iDIPO  =  0;
@@ -239,12 +226,7 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-        if (geo == kHoles) {
-	  FRAME->SetHoles(1);
-	} else {
-	  FRAME->SetHoles(0);
-	}
-
+	FRAME->SetHoles(1);
     }
 
     if (iSHIL)
@@ -266,7 +248,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-	AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","ITS PPR detailed version with asymmetric services");
+	AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)
@@ -285,7 +267,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -294,7 +276,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv2("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
     }
 
     if (iTRD)
@@ -339,13 +321,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)