Separate syswatch for sim. and rec.

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

diff --git a/test/pileup/Config.C b/test/pileup/Config.C
index dc4a1ec2e99ca25aade71f99054493077a1a257b..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");
 
   //
   //=======================================================================
@@ -409,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");
     }