Changeset 25291dd in git for cards/ILCgen/ILCgen_ChrgHadMomentumSmearing.tcl

Timestamp:

Oct 17, 2020, 4:05:03 AM (4 years ago)

Author:

Stephen Sekula <sekula@…>

Children:

44f4a4e

Parents:

4e5ed02 (diff), be1a3be (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:

• cards/ILCgen/ILCgen_ChrgHadMomentumSmearing.tcl (modified) (1 diff)

cards/ILCgen/ILCgen_ChrgHadMomentumSmearing.tcl

@@ -6 +6 @@
 
 set ResolutionFormula {
-
-(abs(eta) <= 2.0) *
-  exp( -6.82012  - 0.284133*abs(eta) + 0.64585*eta*eta
+  (abs(eta) <= 2.0) *
+    exp( -6.82012  - 0.284133*abs(eta) + 0.64585*eta*eta
      + (0.829675 -0.188197*abs(eta) +  0.106226 * eta*eta  - 1.0) * log(pt)
      + (0.0766417-0.00435667*abs(eta) + 0.00174804*eta*eta) * log(pt)*log(pt))
-
-+
-
-(abs(eta) > 2.0 && abs(eta) <= 3.0) *
-  exp(  -4.54609
+  +
+  (abs(eta) > 2.0 && abs(eta) <= 3.0) *
+    exp(  -4.54609
      + ( 0.87526 - 1.0) * log(pt)
      + (-0.0800672 + 0.0891669 * abs(eta)) * log(pt)*log(pt))
-
-}
-
+  }