Fork me on GitHub

Ignore:
Timestamp:
Dec 21, 2014, 4:03:35 PM (10 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
d77b51d
Parents:
7f12612 (diff), e5767b57 (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 remote-tracking branch 'upstream/master'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cards/delphes_card_ATLAS_PileUp.tcl

    r7f12612 rd870fc5  
    249249  set PhotonOutputArray photons
    250250
    251   set EcalTowerMinEnergy 0.50
    252   set HcalTowerMinEnergy 1.00
    253 
    254   set EcalTowerMinSignificance 1.0
    255   set HcalTowerMinSignificance 1.0
     251  set ECalEnergyMin 0.50
     252  set HCalEnergyMin 1.00
     253
     254  set ECalEnergySignificanceMin 1.0
     255  set HCalEnergySignificanceMin 1.0
    256256
    257257  set EFlowTrackOutputArray eflowTracks
Note: See TracChangeset for help on using the changeset viewer.