Changes in modules/Calorimeter.cc [01f457a:82575a3] in git

File:

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

modules/Calorimeter.cc

@@ -1 @@
-/*
- *  Delphes: a framework for fast simulation of a generic collider experiment
- *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
- *  
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 
 /** \class Calorimeter
@@ -153 +135 @@
   }
 */
-
-  // read min E value for towers to be saved
-  fEcalEnergyMin = GetDouble("EcalTowerMinEnergy", 0.0); 
-  fHcalEnergyMin = GetDouble("HcalTowerMinEnergy", 0.0); 
-  
-  fEcalSigmaMin  = GetDouble("EcalTowerMinSignificance", 0.0); 
-  fHcalSigmaMin  = GetDouble("HcalTowerMinSignificance", 0.0); 
-
- 
   // read resolution formulas
   fECalResolutionFormula->Compile(GetString("ECalResolutionFormula", "0"));
@@ -441 +414 @@
 
   if(!fTower) return;
-//  cout<<"----------------------"<<endl;
-//  cout<<"Finalize Tower"<<endl;
-//  cout<<""<<endl;
-
 
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy);
@@ -461 +430 @@
   hcalEnergy = LogNormal(fTowerHCalEnergy, hcalSigma);
   hcalTime = (fTowerHCalWeightTime < 1.0E-09 ) ? 0 : fTowerHCalTime/fTowerHCalWeightTime;
-
-  
-  ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy);
-  hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy);
-
-  ecalEnergy = (ecalEnergy < fEcalEnergyMin || ecalEnergy < fEcalSigmaMin*ecalSigma) ? 0 : ecalEnergy;
-  hcalEnergy = (hcalEnergy < fHcalEnergyMin || hcalEnergy < fHcalSigmaMin*hcalSigma) ? 0 : hcalEnergy;
 
   energy = ecalEnergy + hcalEnergy;
@@ -491 +453 @@
   fTower->Edges[3] = fTowerEdges[3];
 
-  if( energy > 0.0 )
+
+  // fill calorimeter towers
+  if(energy > 0.0)
   {
     if(fTowerPhotonHits > 0 && fTowerTrackHits == 0)
@@ -511 +475 @@
 
   ecalEnergy -= fTrackECalEnergy;
-  if(ecalEnergy < fEcalEnergyMin || ecalEnergy < fEcalSigmaMin*fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy)) ecalEnergy = 0.0;
+  if(ecalEnergy < 0.0) ecalEnergy = 0.0;
 
   hcalEnergy -= fTrackHCalEnergy;
-  if(hcalEnergy < fHcalEnergyMin || hcalEnergy < fHcalSigmaMin*fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy)) hcalEnergy = 0.0;
+  if(hcalEnergy < 0.0) hcalEnergy = 0.0;
 
   energy = ecalEnergy + hcalEnergy;
 
+  
+  // save ECAL and/or HCAL energy excess as an energy flow tower
   if(ecalEnergy > 0.0)
   {
@@ -531 +497 @@
     fEFlowPhotonOutputArray->Add(tower);
   }
+
   if(hcalEnergy > 0.0)
   {