Changeset 49234af in git for modules/SimpleCalorimeter.cc

Timestamp:

Dec 9, 2014, 1:27:13 PM (10 years ago)

Author:

Michele <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

37deb3b, 9e991f8

Parents:

f6b6ee7 (diff), e7e90df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'TestFastJet310b1'

File:

• modules/SimpleCalorimeter.cc (modified) (3 diffs)

modules/SimpleCalorimeter.cc

@@ -147 +147 @@
   }
 */
+
+  // read min E value for towers to be saved
+  fEnergyMin = GetDouble("TowerMinEnergy", 0.0); 
+  fSigmaMin  = GetDouble("TowerMinSignificance", 0.0); 
+ 
   // read resolution formulas
   fResolutionFormula->Compile(GetString("ResolutionFormula", "0"));
@@ -402 +407 @@
   time = (fTowerWeightTime < 1.0E-09 ) ? 0 : fTowerTime/fTowerWeightTime;
 
+  sigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, energy);
+  
+  energy = (energy < fEnergyMin || energy < fSigmaMin*sigma) ? 0 : energy;
+  
   eta = gRandom->Uniform(fTowerEdges[0], fTowerEdges[1]);
   phi = gRandom->Uniform(fTowerEdges[2], fTowerEdges[3]);
@@ -423 +432 @@
   // fill energy flow candidates
   energy -= fTrackEnergy;
-  if(energy < 0.0) energy = 0.0;
+  if(energy < fEnergyMin || energy < fSigmaMin*fResolutionFormula->Eval(0.0, fTowerEta, 0.0, energy)) energy = 0.0;
    
   // save energy excess as an energy flow tower