Fork me on GitHub

Changeset fdfe022 in git


Ignore:
Timestamp:
Dec 16, 2015, 10:47:54 AM (9 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
2f9fb43
Parents:
9f38d6a (diff), 7442f9b (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' of ​https://github.com/delphes/delphes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • cards/delphes_card_ILD.tcl

    r9f38d6a rfdfe022  
    634634  add Branch TowerMerger/towers Tower Tower
    635635
    636   add Branch ChargedHadronMomentumSmearing/chargedHadrons ChargedHadron Track
    637   add Branch HCal/eflowNeutralHadrons NeutralHadron Tower
     636  add Branch HCal/eflowTracks EFlowTrack Track
     637  add Branch ECal/eflowPhotons EFlowPhoton Tower
     638  add Branch HCal/eflowNeutralHadrons EFlowNeutralHadron Tower
    638639 
    639640  add Branch UniqueObjectFinder/photons Photon Photon
Note: See TracChangeset for help on using the changeset viewer.