Fork me on GitHub

Changeset 1bc1d10 in git


Ignore:
Timestamp:
Aug 26, 2016, 2:42:22 PM (8 years ago)
Author:
Alexandre Mertens <alexandre.mertens@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
14fe596
Parents:
f01b690 (diff), a39b82e (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 'dev_01' of ​https://github.com/delphes/delphes into ValidationWorkWithPavel

File:
1 edited

Legend:

Unmodified
Added
Removed

  • cards/delphes_card_CMS.tcl

    rf01b690 r1bc1d10  
    1919  HCal
    2020 
    21   TowerMerger
     21  Calorimeter
    2222  EFlowMerger
    2323
    … …  
    394394###################################################
    395395
    396 module Merger TowerMerger {
     396module Merger Calorimeter {
    397397# add InputArray InputArray
    398398  add InputArray ECal/ecalTowers
    … …  
    713713
    714714  add Branch TrackMerger/tracks Track Track
    715   add Branch TowerMerger/towers Tower Tower
     715  add Branch Calorimeter/towers Tower Tower
    716716
    717717  add Branch HCal/eflowTracks EFlowTrack Track
Note: See TracChangeset for help on using the changeset viewer.