Coverity

[u/mrichter/AliRoot.git] / test / pileup / Config.C

diff --git a/test/pileup/Config.C b/test/pileup/Config.C
index f729028a5528113d6738fc62f88227b0919fd3e9..0054e0f33a15ae1303378b4205a9eb5d5dfb7b7e 100644 (file)
--- a/test/pileup/Config.C
+++ b/test/pileup/Config.C
@@ -129,7 +129,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
   
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor("p-p");
+  AliSimulation::Instance()->SetTriggerConfig("p-p");
 
   //
   //=======================================================================
@@ -241,10 +241,10 @@ void Config()
   AliMagF* field = 0x0;
   if (mag == kNoField) {
     comment = comment.Append(" | L3 field 0.0 T");
-    field = new AliMagF("Maps","Maps", 2, 0., 0., 10., AliMagF::k2kG);
+    field = new AliMagF("Maps","Maps", 0., 0., AliMagF::k5kGUniform);
   } else if (mag == k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
-    field = new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG);
+    field = new AliMagF("Maps","Maps", -1., -1., AliMagF::k5kG);
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
   TGeoGlobalMagField::Instance()->SetField(field);
@@ -375,16 +375,13 @@ void Config()
 
         AliTRD *TRD = new AliTRDv1("TRD", "TRD slow simulator");
         AliTRDgeometry *geoTRD = TRD->GetGeometry();
-       // Partial geometry: modules at 0,8,9,17
+       // Partial geometry: modules at 0,1,7,8,9,10,17
        // starting at 3h in positive direction
-        geoTRD->SetSMstatus(1,0);
        geoTRD->SetSMstatus(2,0);
        geoTRD->SetSMstatus(3,0);
        geoTRD->SetSMstatus(4,0);
         geoTRD->SetSMstatus(5,0);
        geoTRD->SetSMstatus(6,0);
-        geoTRD->SetSMstatus(7,0);
-        geoTRD->SetSMstatus(10,0);
         geoTRD->SetSMstatus(11,0);
         geoTRD->SetSMstatus(12,0);
         geoTRD->SetSMstatus(13,0);
@@ -412,24 +409,7 @@ void Config()
     {
         //=================== PHOS parameters ===========================
 
-        AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP");
-        //Set simulation parameters different from the default ones.
-        AliPHOSSimParam* simEmc = AliPHOSSimParam::GetInstance() ;
-  
-        // APD noise of warm (+20C) PHOS:
-        // a2 = a1*(Y1/Y2)*(M1/M2), where a1 = 0.012 is APD noise at -25C,
-        // Y1 = 4.3 photo-electrons/MeV, Y2 = 1.7 p.e/MeV - light yields at -25C and +20C,
-        // M1 = 50, M2 = 50 - APD gain factors chosen for t1 = -25C and t2 = +20C,
-        // Y = MeanLightYield*APDEfficiency.
-
-        Float_t apdNoise = 0.012*2.5; 
-        simEmc->SetAPDNoise(apdNoise);
-
-        //Raw Light Yield at +20C
-        simEmc->SetMeanLightYield(18800);
-
-        //ADC channel width at +18C.
-        simEmc->SetADCchannelW(0.0125);
+        AliPHOS *PHOS = new AliPHOSv1("PHOS", "noCPV_Modules123");
     }
 
 
@@ -450,7 +430,7 @@ void Config()
     {
         //=================== EMCAL parameters ============================
 
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_FIRSTYEAR");
     }
 
      if (iACORDE)