Changeset 8297d2d in git

Timestamp:

Jan 25, 2018, 4:32:39 PM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

5953e02

Parents:

1f4c2c3 (diff), 270c0ed (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:

uschnoor <ulrike.schnoor@…> (01/25/18 16:32:39)

git-committer:

GitHub <noreply@…> (01/25/18 16:32:39)

Message:

Merge pull request #3 from uschnoor/btagging_for_alljets

object efficiencies added to clicdet card

File:

• cards/delphes_card_CLICdet.tcl (modified) (3 diffs)

cards/delphes_card_CLICdet.tcl

@@ -543 +543 @@
     # set HCalResolutionFormula {resolution formula as a function of eta and energy}
 
-    set ResolutionFormula {                  (abs(eta) <= 3.0) * sqrt(energy^2*0.015^2 + energy*0.50^2)}
+        # set ResolutionFormula {                  (abs(eta) <= 3.0) * sqrt(energy^2*0.015^2 + energy*0.50^2)}
+        set ResolutionFormula { (abs(eta)< 0.8) * sqrt(1.48^2  + 0.251^2*energy  + 0.0537^2*energy^2) +
+        (abs(eta)>= 0.8 && abs(eta)<=3) * sqrt( 1.09^2 + 0.321^2*energy + 0.0517^2*energy^2  )}
 
 }
@@ -612 +614 @@
 
     # efficiency formula for photons
-    set EfficiencyFormula {                                      (pt <= 10.0) * (0.00) +
-        (abs(eta) <= 1.5) * (pt > 10.0)  * (0.95) +
-        (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0)  * (0.95) +
-        (abs(eta) > 2.5)                                   * (0.00)}
+        # including converted photons
+        #0.94 for |costheta| < 0.6, i.e. |eta|< 0.7
+        #0.9 for |costheta| > 0.6, i.e. |eta|>0.7 but smaller than 3
+
+
+        set EfficiencyFormula {(abs(eta) < 0.7)*(0.94) + (abs(eta) >=0.7 && abs(eta) <=3.0) * (0.9)     }
+        #old:
+    #set EfficiencyFormula {                                      (pt <= 10.0) * (0.00) +
+        #(abs(eta) <= 1.5) * (pt > 10.0)  * (0.95) +
+        #(abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0)  * (0.95) +
+        #(abs(eta) > 2.5)                                   * (0.00)}
 }
 
@@ -680 +689 @@
 
     # 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)) +
-        (abs(eta) > 2.4)                                                 * (0.00)}
+        set EfficiencyFormula {(energy  < 50 )*(0.98) + (energy>=50) *(0.999)}
+    #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)) +
+        #(abs(eta) > 2.4)                                                 * (0.00)}
 }