Changeset 94cacb6 in git

Timestamp:

Aug 26, 2016, 4:57:31 PM (8 years ago)

Author:

Alexandre Mertens <alexandre.mertens@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

21eab4f, caa953a

Parents:

d0f661b (diff), 998790a (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:

• cards/delphes_card_CMS.tcl (modified) (1 diff)

cards/delphes_card_CMS.tcl

@@ -498 +498 @@
 
   # efficiency formula for muons
-  set EfficiencyFormula {                                      (pt <= 10.0)               * (0.00) +
-                                           (abs(eta) <= 1.5) * (pt > 10.0 && pt <= 1.0e3) * (0.95) +
-                                           (abs(eta) <= 1.5) * (pt > 1.0e3)               * (0.95 * exp(0.5 - pt*5.0e-4)) +
-                         (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 10.0 && pt <= 1.0e3) * (0.95) +
-                         (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 1.0e3)               * (0.95 * exp(0.5 - pt*5.0e-4)) +
+  set EfficiencyFormula {                                     (pt <= 10.0)                * (0.00) +
+                                           (abs(eta) <= 1.5) * (pt > 10.0)                * (0.95) +
+                         (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 10.0)                * (0.95) +
                          (abs(eta) > 2.4)                                                 * (0.00)}
 }