Changes in cards/FCC/FCChh.tcl [7498fde:eb332c8] in git

File:

• cards/FCC/FCChh.tcl (modified) (4 diffs)

cards/FCC/FCChh.tcl

@@ -692 +692 @@
 
   (pt <= 10.0)                       * (0.00) +
-  (abs(eta) < 2.5)                   * (pt > 10.0 && pt < 500)      * (0.01) + \
-  (abs(eta) < 2.5)                   * (pt > 500.0 && pt < 15000.0) * (0.01)*(1.0 - pt/15000.) + \
-  (abs(eta) < 2.5)                   * (pt > 15000.0)               * (0.00) + \
-  (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500)      * (0.0075) + \
-  (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 15000.0) * (0.0075)*(1.0 - pt/15000.) + \
-  (abs(eta) < 2.5 && abs(eta) < 4.0) * (pt > 15000.0)               * (0.000) + \
+  (abs(eta) < 2.5)                   * (pt > 10.0 && pt < 500)      * (0.001) + \
+  (abs(eta) < 2.5)                   * (pt > 500.0 && pt < 20000.0) * (0.001)*(1.0 - pt/20000.) + \
+  (abs(eta) < 2.5)                   * (pt > 20000.0)               * (0.000) + \
+  (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500)      * (0.00075) + \
+  (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 20000.0) * (0.00075)*(1.0 - pt/20000.) + \
+  (abs(eta) < 2.5 && abs(eta) < 4.0) * (pt > 20000.0)               * (0.000) + \
   (abs(eta) > 4.0) * (0.00)}
 
@@ -704 +704 @@
   (pt <= 10.0)                       * (0.00) +
   (abs(eta) < 2.5)                   * (pt > 10.0 && pt < 500)      * (0.04) + \
-  (abs(eta) < 2.5)                   * (pt > 500.0 && pt < 15000.0) * (0.04)*(1.0 - pt/15000.) + \
-  (abs(eta) < 2.5)                   * (pt > 15000.0)               * (0.000) + \
+  (abs(eta) < 2.5)                   * (pt > 500.0 && pt < 20000.0) * (0.04)*(1.0 - pt/20000.) + \
+  (abs(eta) < 2.5)                   * (pt > 20000.0)               * (0.000) + \
   (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500)      * (0.03) + \
-  (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 15000.0) * (0.03)*(1.0 - pt/15000.) + \
-  (abs(eta) < 2.5 && abs(eta) < 4.0) * (pt > 15000.0)               * (0.000) + \
+  (abs(eta) > 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 20000.0) * (0.03)*(1.0 - pt/20000.) + \
+  (abs(eta) < 2.5 && abs(eta) < 4.0) * (pt > 20000.0)               * (0.000) + \
   (abs(eta) > 4.0) * (0.00)}
 
@@ -715 +715 @@
   (pt <= 10.0)                                                       * (0.00) +
   (abs(eta) < 2.5)                    * (pt > 10.0 && pt < 500)      * (0.85) + 
-  (abs(eta) < 2.5)                    * (pt > 500.0 && pt < 15000.0) * (0.85)*(1.0 - pt/15000.) + 
-  (abs(eta) < 2.5)                    * (pt > 15000.0)               * (0.000) + 
+  (abs(eta) < 2.5)                    * (pt > 500.0 && pt < 20000.0) * (0.85)*(1.0 - pt/20000.) + 
+  (abs(eta) < 2.5)                    * (pt > 20000.0)               * (0.000) + 
   (abs(eta) >= 2.5 && abs(eta) < 4.0) * (pt > 10.0 && pt < 500)      * (0.64) + 
-  (abs(eta) >= 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 15000.0) * (0.64)*(1.0 - pt/15000.) + 
-  (abs(eta) <= 2.5 && abs(eta) < 4.0) * (pt > 15000.0)               * (0.000) + 
+  (abs(eta) >= 2.5 && abs(eta) < 4.0) * (pt > 500.0 && pt < 20000.0) * (0.64)*(1.0 - pt/20000.) + 
+  (abs(eta) <= 2.5 && abs(eta) < 4.0) * (pt > 20000.0)               * (0.000) + 
   (abs(eta) >= 4.0) * (0.00)}
 
@@ -742 +742 @@
 
   (pt <= 10.0)     * (0.00) +
+  (abs(eta) < 4.0) * (pt > 10.0) * (0.10) + \
+  (abs(eta) > 4.0) * (pt > 10.0) * (0.00)}
+
+  add EfficiencyFormula {5} {
+
+  (pt <= 10.0)     * (0.00) +
   (abs(eta) < 4.0) * (pt > 10.0) * (0.25) + \
-  (abs(eta) > 4.0) * (pt > 10.0) * (0.00)}
-
-  add EfficiencyFormula {5} {
-
-  (pt <= 10.0)     * (0.00) +
-  (abs(eta) < 4.0) * (pt > 10.0) * (0.03) + \
   (abs(eta) > 4.0) * (pt > 10.0) * (0.00)}