DA rpms

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

diff --git a/FMD/Config.C b/FMD/Config.C
index 2bdd919851435088aac15f360a041e2f1c66e07c..f61f53e45d0333d3bd49ee5b11343cffa013a141 100644 (file)
--- a/FMD/Config.C
+++ b/FMD/Config.C
@@ -173,12 +173,7 @@ 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;
   AliMagF::BMap_t mag  = AliMagF::k5kG;
@@ -233,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");
     
       // 
@@ -366,8 +361,7 @@ Config()
     
   //__________________________________________________________________
   // Field (L3 0.4 T)
-  AliMagF* field = new AliMagF("Maps","Maps",2,1.,1., 10.,AliMagF::k5kG);
-  field->SetL3ConstField(0); //Using const. field in the barrel
+  AliMagF* field = new AliMagF("Maps","Maps",-1., -1., mag);
   TGeoGlobalMagField::Instance()->SetField(field);
 
   rl->CdGAFile();
@@ -394,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 =========================
@@ -420,7 +414,7 @@ Config()
   }
   if (useSHIL)   AliSHIL   *SHIL   = new AliSHILv3("SHIL", "Shielding v3");
   if (usePIPE)   AliPIPE   *PIPE   = new AliPIPEv3("PIPE", "Beam Pipe");
-  if (useITS)    AliITS    *ITS    = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+  if (useITS)    AliITS    *ITS    = new AliITSv11("ITS","ITS v11");
   if (useTPC)    AliTPC    *TPC    = new AliTPCv2("TPC", "Default");
   if (useTOF)    AliTOF    *TOF    = new AliTOFv6T0("TOF", "normal TOF");
   if (useHMPID)  AliHMPID  *HMPID  = new AliHMPIDv1("HMPID", "normal HMPID");
@@ -431,7 +425,7 @@ Config()
   if (usePHOS)   AliPHOS   *PHOS   = new AliPHOSv1("PHOS", "IHEP");
   if (usePMD)    AliPMD    *PMD    = new AliPMDv1("PMD", "normal PMD");
   if (useT0)     AliT0     *T0     = new AliT0v1("T0", "T0 Detector");
-  if (useEMCAL)  AliEMCAL  *EMCAL  = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+  if (useEMCAL)  AliEMCAL  *EMCAL  = new AliEMCALv2("EMCAL", "EMCAL_COMPLETEV1");
   if (useACORDE) AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
   if (useVZERO)  AliVZERO  *VZERO  = new AliVZEROv7("VZERO", "normal VZERO");
 }
@@ -1291,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);