Changeset 10 in svn for trunk

Timestamp:

Nov 6, 2008, 11:15:30 AM (16 years ago)

Author:

severine ovyn

Message:

Bug removed in SmearHadron: sum of two gaussian smearing which could be negative

File:

• trunk/src/SmearUtil.cc (modified) (2 diffs)

trunk/src/SmearUtil.cc

@@ -212 +212 @@
   // some of the particles decay mostly in the ecal, some mostly in the hcal
   
+float energyS1,energyS2;
   if(fabs(hadron.Eta()) < MAX_CALO_CEN) {
-    float energyS1 = gRandom->Gaus(energy_hcal, sqrt(
+   energyS1 = gRandom->Gaus(energy_hcal, sqrt(
                                               pow(HAD_Nhcal,2) +
                                               pow(HAD_Chcal*energy_hcal,2) + 
                                               pow(HAD_Shcal*sqrt(energy_hcal),2) )) ;
+     
       
-    float energyS2 = gRandom->Gaus(energy_ecal, sqrt(
+   energyS2 =  gRandom->Gaus(energy_ecal, sqrt(
                                       pow(HAD_Necal,2) +
                                       pow(HAD_Cecal*energy_ecal,2) + 
-                                      pow(HAD_Secal*sqrt(energy_ecal),2) ) );
-
-        energyS = (energyS1>0)?energyS1:0 + (energyS2>0)?energyS2:0;
-        cout << "avant: " << energyS1 + energyS2 << "\t\t" << energyS << endl;
+                                      pow(HAD_Secal*sqrt(energy_ecal),2) ) );     
+
+  energyS = ((energyS1>0)?energyS1:0) + ((energyS2>0)?energyS2:0);
   } else { 
     energyS = gRandom->Gaus(energy, 
@@ -231 +232 @@
                             pow(HAD_Shf*sqrt(energy),2) );
   }
+
+
   hadron.SetPtEtaPhiE(energyS/cosh(hadron.Eta()),hadron.Eta(), hadron.Phi(), energyS);