Changeset fbad4c7 in git for classes/DelphesClasses.cc

Timestamp:

May 24, 2018, 9:12:31 PM (6 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

4689481

Parents:

4fd4f01 (diff), 792092a (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 'master' into photonId

Conflicts:

cards/CMS_PhaseII/CMS_PhaseII_200PU_v03.tcl

File:

• classes/DelphesClasses.cc (modified) (3 diffs)

classes/DelphesClasses.cc

@@ -125 +125 @@
   Flavor(0), FlavorAlgo(0), FlavorPhys(0),
   BTag(0), BTagAlgo(0), BTagPhys(0),
-  TauTag(0), Eem(0.0), Ehad(0.0),
+  TauTag(0), TauWeight(0.0), Eem(0.0), Ehad(0.0),
   DeltaEta(0.0), DeltaPhi(0.0),
   Momentum(0.0, 0.0, 0.0, 0.0),
@@ -280 +280 @@
   object.BTagPhys = BTagPhys;
   object.TauTag = TauTag;
+  object.TauWeight = TauWeight;
   object.Eem = Eem;
   object.Ehad = Ehad;
@@ -404 +405 @@
   BTagPhys = 0;
   TauTag = 0;
+  TauWeight = 0.0;
   Eem = 0.0;
   Ehad = 0.0;