Changing defualt values and description in DA

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

diff --git a/FMD/Config.C b/FMD/Config.C
index efbf03da3ec4255db5b42510ede3d0e5bc0497f3..54961d6860a77e874a581c943777de1cbf12ea74 100644 (file)
--- a/FMD/Config.C
+++ b/FMD/Config.C
@@ -211,7 +211,7 @@ Config()
       //
       // Libraries needed by GEANT 3.21 
       //
-      gSystem->Load("$ALICE_ROOT/lib/tgt_$ALICE_TARGET/libpythia6.so");
+      gSystem->Load("$ALICE_ROOT/lib/tgt_$ALICE_TARGET/libpythia6");
       gSystem->Load("libgeant321");
       
       // 
@@ -226,10 +226,10 @@ Config()
       //
       // Libraries needed by GEANT 3.21 
       //
-      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("$ALICE_ROOT/lib/tgt_$ALICE_TARGET/liblhapdf");
+      gSystem->Load("$ALICE_ROOT/lib/tgt_$ALICE_TARGET/libpythia6");
+      gSystem->Load("libEGPythia6"); //<- For non-debian (sigh!)
+      // gSystem->Load("EGPythia6");
       gSystem->Load("libgeant321");
     
       // 
@@ -361,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();
@@ -415,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");
@@ -426,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");
 }
@@ -470,10 +469,10 @@ GeneratorFactory(EG_t eg, Rad_t rad)
   case kPythia6Jets104_125:
   case kPythia6Jets125_150:
   case kPythia6Jets150_180:
-    gSystem->Load("liblhapdf.so");
-    // gSystem->Load("/usr/lib/libpythia.so");
+    gSystem->Load("liblhapdf");
+    // gSystem->Load("/usr/lib/libpythia");
     // gSystem->ListLibraries();
-    gSystem->Load("EGPythia6.so");
+    gSystem->Load("EGPythia6");
     gSystem->Load("libAliPythia6");
     break;
   }