Changeset d870fc5 in git for modules/SimpleCalorimeter.h

Timestamp:

Dec 21, 2014, 4:03:35 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d77b51d

Parents:

7f12612 (diff), e5767b57 (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 remote-tracking branch 'upstream/master'

File:

• modules/SimpleCalorimeter.h (modified) (5 diffs)

modules/SimpleCalorimeter.h

@@ -2 +2 @@
  *  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/>.
@@ -24 +24 @@
  *  Fills SimpleCalorimeter towers, performs SimpleCalorimeter resolution smearing,
  *  and creates energy flow objects (tracks, photons, and neutral hadrons).
- *
- *  $Date: 2014-04-16 15:29:31 +0200 (Wed, 16 Apr 2014) $
- *  $Revision: 1364 $
- *
  *
  *  \author P. Demin - UCL, Louvain-la-Neuve
@@ -63 +59 @@
   Double_t fTowerEnergy;
   Double_t fTrackEnergy;
-  
+
   Double_t fTowerTime;
   Double_t fTrackTime;
-   
-  Double_t fTowerWeightTime;
-  Double_t fTrackWeightTime;
-  
+
+  Double_t fTowerTimeWeight;
+  Double_t fTrackTimeWeight;
+
   Int_t fTowerTrackHits, fTowerPhotonHits;
 
   Double_t fEnergyMin;
-  Double_t fSigmaMin;
+
+  Double_t fEnergySignificanceMin;
+
+  Bool_t fDitherTowerCenter;
 
   TFractionMap fFractionMap; //!
@@ -84 +83 @@
 
   std::vector < Double_t > fTowerFractions;
-  
+
   std::vector < Double_t > fTrackFractions;
- 
+
   DelphesFormula *fResolutionFormula; //!
- 
+
   TIterator *fItParticleInputArray; //!
   TIterator *fItTrackInputArray; //!
@@ -96 +95 @@
 
   TObjArray *fTowerOutputArray; //!
- 
+
   TObjArray *fEFlowTowerOutputArray; //!
- 
+
   TObjArray *fTowerTrackArray; //!
   TIterator *fItTowerTrackArray; //!