Changeset 9666d3b in git for cards/delphes_card_ATLAS_PileUp.tcl

Timestamp:

Apr 11, 2018, 4:19:18 PM (7 years ago)

Author:

Ulrike Schnoor <ulrike.schnoor@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6ba7847

Parents:

6f96f62 (diff), a670493 (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:

merged the upstream/master

File:

• cards/delphes_card_ATLAS_PileUp.tcl (modified) (2 diffs)

cards/delphes_card_ATLAS_PileUp.tcl

@@ -360 +360 @@
 }
 
-
 ####################
 # Energy flow merger
@@ -378 +377 @@
 
 module PdgCodeFilter EFlowFilter {
-  set InputArray EFlowMergerAllTracks/eflow
+  set InputArray EFlowMerger/eflow
   set OutputArray eflow