Fork me on GitHub

Ignore:
Timestamp:
Aug 26, 2016, 5:17:14 PM (8 years ago)
Author:
GitHub <noreply@…>
Parents:
ec5e04b (diff), 94cacb6 (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.
git-author:
AlexandreMertens <alexandre.mertens@…> (08/26/16 17:17:14)
git-committer:
GitHub <noreply@…> (08/26/16 17:17:14)
Message:

Merge 94cacb6ab322f96b75a06369dfd9b7389d0d6802 into ec5e04b014990ea45a8708f4f726b6b214cdb82b

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cards/delphes_card_ATLAS_PileUp.tcl

    rec5e04b r21eab4f  
    177177  # resolution formula for charged hadrons
    178178  # based on arXiv:1405.6569
    179   set ResolutionFormula {                  (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.01^2 + pt^2*1.5e-4^2) +
    180                          (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.015^2 + pt^2*2.5e-4^2) +
    181                          (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1) * sqrt(0.025^2 + pt^2*5.5e-4^2)}
     179  set ResolutionFormula {                  (abs(eta) <= 0.5) * (pt > 0.1) * sqrt(0.06^2 + pt^2*1.3e-3^2) +
     180                         (abs(eta) > 0.5 && abs(eta) <= 1.5) * (pt > 0.1) * sqrt(0.10^2 + pt^2*1.7e-3^2) +
     181                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1) * sqrt(0.25^2 + pt^2*3.1e-3^2)}
    182182}
    183183
Note: See TracChangeset for help on using the changeset viewer.