Fork me on GitHub

Ignore:
Timestamp:
Nov 20, 2015, 2:36:11 PM (9 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
fdfe022
Parents:
554a3b3 (diff), 7312b4d (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_ATLAS_PileUp.tcl

    r554a3b3 r9f38d6a  
    500500module Isolation PhotonIsolation {
    501501  set CandidateInputArray PhotonEfficiency/photons
    502   set IsolationInputArray EFlowMerger/eflow
     502  set IsolationInputArray EFlowMergerAllTracks/eflow
    503503  set RhoInputArray Rho/rho
    504504
    … …  
    535535module Isolation ElectronIsolation {
    536536  set CandidateInputArray ElectronEfficiency/electrons
    537   set IsolationInputArray EFlowMerger/eflow
     537  set IsolationInputArray EFlowMergerAllTracks/eflow
    538538  set RhoInputArray Rho/rho
    539539
    … …  
    570570module Isolation MuonIsolation {
    571571  set CandidateInputArray MuonEfficiency/muons
    572   set IsolationInputArray EFlowMerger/eflow
     572  set IsolationInputArray EFlowMergerAllTracks/eflow
    573573  set RhoInputArray Rho/rho
    574574
Note: See TracChangeset for help on using the changeset viewer.