ACORDEv1 is now the default

[u/mrichter/AliRoot.git] / FMD / Config.C

diff --git a/FMD/Config.C b/FMD/Config.C
index 48157d3e00dd0dd324c4ec788c2f7b46e9de214a..88efeace803cb351277343a0a3ed4469771ecddc 100644 (file)
--- a/FMD/Config.C
+++ b/FMD/Config.C
@@ -57,8 +57,8 @@
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
-#include "EMCAL/AliEMCALv1.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "EMCAL/AliEMCALv2.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv2.h"
 #endif
 
@@ -447,13 +447,16 @@ Config()
   field->SetL3ConstField(0); //Using const. field in the barrel
   rl->CdGAFile();
   gAlice->SetField(field);    
+  TFile* magF = TFile::Open("mag.root", "RECREATE");
+  field->Write("mag");
+  magF->Close();
 
   //__________________________________________________________________
   // 
   // Used detectors 
   // 
   Bool_t useABSO  = kFALSE; 
-  Bool_t useACORDE   = kFALSE; 
+  Bool_t useACORDE= kFALSE; 
   Bool_t useDIPO  = kFALSE; 
   Bool_t useFMD   = kTRUE; 
   Bool_t useFRAME = kFALSE; 
@@ -464,9 +467,9 @@ Config()
   Bool_t usePHOS  = kFALSE; 
   Bool_t usePIPE  = kFALSE; 
   Bool_t usePMD   = kFALSE; 
-  Bool_t useHMPID  = kFALSE; 
+  Bool_t useHMPID = kFALSE; 
   Bool_t useSHIL  = kFALSE; 
-  Bool_t useT0 = kFALSE; 
+  Bool_t useT0    = kFALSE; 
   Bool_t useTOF   = kFALSE; 
   Bool_t useTPC   = kFALSE;
   Bool_t useTRD   = kFALSE; 
@@ -523,6 +526,8 @@ Config()
   }
   
   if (useITS) {
+     AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+#if 0
     // =================== ITS parameters ============================
     //
     // As the innermost detector in ALICE, the Inner Tracking System
@@ -598,6 +603,7 @@ Config()
     // want to use this facility.
     //
     ITS->SetEUCLID(0);
+#endif
   }
 
   if (useTPC) {
@@ -692,12 +698,12 @@ Config()
 
   if (useEMCAL) {
     // =================== EMCAL parameters ==========================
-    AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCAL_55_25");
+    AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
   }
 
   if (useACORDE) {
     // =================== ACORDE parameters ============================
-    AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+    AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
   }
 
   if (useVZERO) {