Changes in cards/delphes_card_CLICdet_Stage1.tcl [8d7319c:505a779] in git

File:

• cards/delphes_card_CLICdet_Stage1.tcl (modified) (4 diffs)

cards/delphes_card_CLICdet_Stage1.tcl

@@ -298 +298 @@
 
     set EfficiencyFormula {
- (pt <= 0.1)                                                                        * (0.000) +
- (pt > 0.1)                                * (abs(eta) > 2.54)                      * (0.000) +
- (pt > 0.1) * (energy >= 80)               * (abs(eta) < 2.54)                      * (1.000) +
- (pt > 0.1) * (energy < 80 && energy >= 3) * (abs(eta) <=2.54 && abs(eta) > 2.34)   * (0.994) +
- (pt > 0.1) * (energy < 80 && energy >= 3) * (abs(eta) <= 2.34)                     * (1.000) +
- (pt > 0.1) * (energy < 3)                 * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.990) +
- (pt > 0.1) * (energy < 3)                 * (abs(eta) <= 0.55 )                    * (1.000) 
+        (abs(eta) > 2.54) * (0.000) +
+        (energy >= 80) * (abs(eta) < 2.54)  * (1.000) +
+        (energy < 80 && energy >= 3) * (abs(eta) <=2.54 && abs(eta) > 2.34)  * (0.994) +
+        (energy < 80 && energy >= 3) * (abs(eta) <= 2.34) * (1.000) +
+        (energy < 3) * (abs(eta) <= 2.54 && abs(eta) > 0.55 ) * (0.000) +
+        (energy < 3) * (abs(eta) <= 0.55 ) * (1.000) 
     }
 }
@@ -319 +318 @@
     # Current full simulation with CLICdet provides for electrons:
     set EfficiencyFormula {
- (pt <= 0.1)                                                                        * (0.000) +
- (pt > 0.1)                                * (abs(eta) > 2.54)                      * (0.000) +
- (pt > 0.1) * (energy >= 80)               * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) +
- (pt > 0.1) * (energy >= 80)               * (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) +
- (pt > 0.1) * (energy >= 80)               * (abs(eta) <= 2.34  )                   * (1.000) +
- (pt > 0.1) * (energy < 80 && energy >= 5) * (abs(eta) <= 2.54 && abs(eta) > 2.17 ) * (0.998) +
- (pt > 0.1) * (energy < 80 && energy >= 5) * (abs(eta) <= 2.17)                     * (1.000) +
- (pt > 0.1) * (energy < 5)                 * (abs(eta) <= 2.54 && abs(eta) > 2.34 ) * (1.000) +
- (pt > 0.1) * (energy < 5)                 * (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) +
- (pt > 0.1) * (energy < 5)                 * (abs(eta) <= 0.76)                     * (0.999)
+        (pt <= 1)                                                               * (0.000) +
+        (abs(eta) > 2.54)                                                       * (0.000) +
+        (energy >= 80)                 * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (0.993) +
+        (energy >= 80)                 * (abs(eta) <= 2.44 && abs(eta) > 2.34 ) * (0.997) +
+        (energy >= 80)                 * (abs(eta) <= 2.34  )                   * (1.000) +
+        (energy < 80 && energy >= 5) * (abs(eta) <= 2.54 && abs(eta) > 2.17 ) * (0.998) +
+        (energy < 80 && energy >= 5) * (abs(eta) <= 2.17)                     * (1.000) +
+        (energy < 5)   * (abs(eta) > 2.34 )                     * (0.000) +
+        (energy < 5)   * (abs(eta) <= 2.34 && abs(eta) > 0.76 ) * (0.997) +
+        (energy < 5)   * (abs(eta) <= 0.76)                     * (0.999)
     }
 }
@@ -342 +341 @@
     # Current full simulation with CLICdet provides for muons:
     set EfficiencyFormula {
-  (pt <= 0.1)                                                                          * (0.000) +
-  (pt > 0.1) * (abs(eta) > 2.54)                                                       * (0.000) +
-  (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 80)                 * (0.994) +
-  (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 5 && energy < 80)   * (0.996) +
-  (pt > 0.1) * (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy < 5 )                  * (0.996) +
-  (pt > 0.1) * (abs(eta) <= 2.44 )                    * (energy >= 5 )                 * (1.000) +
-  (pt > 0.1) * (abs(eta) <= 2.44 && abs(eta) > 2.25 ) * (energy < 5 )                  * (0.999) +
-  (pt > 0.1) * (abs(eta) <= 2.25 )                    * (energy < 5 )                  * (1.000) 
+        (pt < 1)                                                                * (0.000) +
+        (abs(eta) > 2.54)                                                       * (0.000) +
+        (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 80)                 * (0.994) +
+        (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy >= 5 && energy < 80)   * (0.996) +
+        (abs(eta) <= 2.54 && abs(eta) > 2.44 ) * (energy < 5 )                  * (0.996) +
+        (abs(eta) <= 2.44 )                    * (energy >= 5 )                 * (1.000) +
+        (abs(eta) <= 2.44 && abs(eta) > 2.25 ) * (energy < 5 && pt >=1 )        * (0.999) +
+        (abs(eta) <= 2.25 )                    * (energy >= 1)                  * (1.000) 
+
+        
     }
 }
@@ -944 +945 @@
 module FastJetFinder FastJetFinderKt {
     #  set InputArray Calorimeter/towers
-    set InputArray EFlowFilter/eflow
+    set InputArray EFlowMerger/eflow
 
     set OutputArray KTjets