Changeset f85a40e in git for modules/Calorimeter.cc

Timestamp:

Sep 4, 2013, 3:07:05 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a1ac20e

Parents:

852bc18

Message:

remove sigma cut and switch to gaussian distribution for calorimeter smearing

File:

• modules/Calorimeter.cc (modified) (2 diffs)

modules/Calorimeter.cc

@@ -388 +388 @@
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy);
 
-//  ecalEnergy = gRandom->Gaus(fTowerECalEnergy, ecalSigma);
-//  if(ecalEnergy < 0.0) ecalEnergy = 0.0;
-
-  ecalEnergy = LogNormal(fTowerECalEnergy, ecalSigma);
+  ecalEnergy = gRandom->Gaus(fTowerECalEnergy, ecalSigma);
+  if(ecalEnergy < 0.0) ecalEnergy = 0.0;
+
+//  ecalEnergy = LogNormal(fTowerECalEnergy, ecalSigma);
 
   hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerHCalEnergy);
 
-//  hcalEnergy = gRandom->Gaus(fTowerHCalEnergy, hcalSigma);
-//  if(hcalEnergy < 0.0) hcalEnergy = 0.0;
-
-  hcalEnergy = LogNormal(fTowerHCalEnergy, hcalSigma);
+  hcalEnergy = gRandom->Gaus(fTowerHCalEnergy, hcalSigma);
+  if(hcalEnergy < 0.0) hcalEnergy = 0.0;
+
+//  hcalEnergy = LogNormal(fTowerHCalEnergy, hcalSigma);
 
   energy = ecalEnergy + hcalEnergy;
@@ -441 +441 @@
 
   ecalEnergy -= fTrackECalEnergy;
-  if(ecalEnergy < 0.0 || ecalEnergy < ecalSigma) ecalEnergy = 0.0;
+  if(ecalEnergy < 0.0) ecalEnergy = 0.0;
 
   hcalEnergy -= fTrackHCalEnergy;
-  if(hcalEnergy < 0.0 || hcalEnergy < hcalSigma) hcalEnergy = 0.0;
+  if(hcalEnergy < 0.0) hcalEnergy = 0.0;
 
   energy = ecalEnergy + hcalEnergy;