X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=FMD%2FConfig.C;h=e49b6dc07d4669d355a45c6a03cc11a02802f7e3;hb=8c267534d046be0ccbda11470fa9abb2cac7427f;hp=8e4105e328ededd1509c2e4148d63e38fff1d5a3;hpb=faf80567e50c3b411106dcc26a9d3e95b6a1fa1a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/FMD/Config.C b/FMD/Config.C
index 8e4105e328e..e49b6dc07d4 100644
--- a/FMD/Config.C
+++ b/FMD/Config.C
@@ -151,13 +151,6 @@ enum Rad_t {
   kNoGluonRadiation		//
 };
 
-//____________________________________________________________________
-enum Mag_t {
-  k2kG,				//
-  k4kG,				//
-  k5kG				//
-};
-
 //____________________________________________________________________
 enum MC_t {
   kFLUKA, 
@@ -180,15 +173,10 @@ Config()
 {
   //____________________________________________________________________
   // This part for configuration    
-  // EG_t  eg   = test50;
-  // EG_t  eg   = kParam_fmd;
-  // EG_t  eg   = kFMDFlat; // kParam_2000; // kPythia;
-  // EG_t  eg   = kFMDFlat;
   EG_t  eg   = kPythia6;
-  // EG_t  eg   = kFMD2Flat;
   Geo_t geo  = kNoHoles;
   Rad_t rad  = kGluonRadiation;
-  Mag_t mag  = k5kG;
+  AliMagF::BMap_t mag  = AliMagF::k5kG;
   Int_t seed = 12345; //Set 0 to use the current time
   MC_t  mc   = kGEANT3TGEO;
   
@@ -240,8 +228,8 @@ Config()
       //
       gSystem->Load("$ALICE_ROOT/lib/tgt_$ALICE_TARGET/liblhapdf.so");
       gSystem->Load("$ALICE_ROOT/lib/tgt_$ALICE_TARGET/libpythia6.so");
-      // gSystem->Load("libEGPythia6.so"); //<- For non-debian (sigh!)
-      gSystem->Load("EGPythia6.so");
+      gSystem->Load("libEGPythia6.so"); //<- For non-debian (sigh!)
+      // gSystem->Load("EGPythia6.so");
       gSystem->Load("libgeant321");
     
       // 
@@ -373,10 +361,11 @@ Config()
     
   //__________________________________________________________________
   // Field (L3 0.4 T)
-  AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., mag);
-  field->SetL3ConstField(0); //Using const. field in the barrel
+  AliMagF* field = new AliMagF("Maps","Maps",-1., -1., mag);
+  TGeoGlobalMagField::Instance()->SetField(field);
+
   rl->CdGAFile();
-  gAlice->SetField(field);    
+
   TFile* magF = TFile::Open("mag.root", "RECREATE");
   field->Write("mag");
   magF->Close();
@@ -391,7 +380,7 @@ Config()
   Bool_t useFMD   = kTRUE; 
   Bool_t useFRAME = kFALSE; 
   Bool_t useHALL  = kFALSE; 
-  Bool_t useITS   = kFALSE;
+  Bool_t useITS   = kTRUE;
   Bool_t useMAG   = kFALSE; 
   Bool_t useMUON  = kFALSE; 
   Bool_t usePHOS  = kFALSE; 
@@ -399,13 +388,13 @@ Config()
   Bool_t usePMD   = kFALSE; 
   Bool_t useHMPID = kFALSE; 
   Bool_t useSHIL  = kFALSE; 
-  Bool_t useT0    = kFALSE; 
+  Bool_t useT0    = kTRUE; 
   Bool_t useTOF   = kFALSE; 
   Bool_t useTPC   = kFALSE;
   Bool_t useTRD   = kFALSE; 
   Bool_t useZDC   = kFALSE; 
   Bool_t useEMCAL = kFALSE; 
-  Bool_t useVZERO = kFALSE;
+  Bool_t useVZERO = kTRUE;
 
   cout << "\t* Creating the detectors ..." << endl;
   // ================= Alice BODY parameters =========================
@@ -1296,7 +1285,7 @@ GeneratorFactory(EG_t eg, Rad_t rad)
     break;
   case kFMD2Flat: 
     {
-      AliGenBox* gener = new AliGenBox(10);
+      AliGenBox* gener = new AliGenBox(100);
       gener->SetPart(kPiPlus);
       gener->SetMomentumRange(3,4);
       gener->SetPhiRange(0, 360);