Changeset dd514ae in git for modules/SimpleCalorimeter.h

Timestamp:

Jun 10, 2015, 4:04:47 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8707eeb

Parents:

6ec8d18 (diff), 9c491e1 (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:

resolve conflict in DelphesClasses.h

File:

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

modules/SimpleCalorimeter.h

@@ +1 @@
+
 /*
  *  Delphes: a framework for fast simulation of a generic collider experiment
@@ -74 +75 @@
   Bool_t fSmearTowerCenter;
 
+  Bool_t fIsEcal; //! 
+
   TFractionMap fFractionMap; //!
   TBinMap fBinMap; //!