Fork me on GitHub

Changeset fbad4c7 in git for classes/DelphesClasses.cc


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • classes/DelphesClasses.cc

    r4fd4f01 rfbad4c7  
    125125  Flavor(0), FlavorAlgo(0), FlavorPhys(0),
    126126  BTag(0), BTagAlgo(0), BTagPhys(0),
    127   TauTag(0), Eem(0.0), Ehad(0.0),
     127  TauTag(0), TauWeight(0.0), Eem(0.0), Ehad(0.0),
    128128  DeltaEta(0.0), DeltaPhi(0.0),
    129129  Momentum(0.0, 0.0, 0.0, 0.0),
     
    280280  object.BTagPhys = BTagPhys;
    281281  object.TauTag = TauTag;
     282  object.TauWeight = TauWeight;
    282283  object.Eem = Eem;
    283284  object.Ehad = Ehad;
     
    404405  BTagPhys = 0;
    405406  TauTag = 0;
     407  TauWeight = 0.0;
    406408  Eem = 0.0;
    407409  Ehad = 0.0;
Note: See TracChangeset for help on using the changeset viewer.