diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
index f0245e030e61508608cf8872b05db8cf395499b0..5075a6b06f186220c3beed90ac635244fbbe19c4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
@@ -6,6 +6,29 @@ class ThresholdDef:
alreadyExecuted = False
+ eEMVar = {
+ 1 : {
+ "eta_bin_boundaries": [0, 0.7, 0.8, 1.1, 1.3, 1.4, 1.5, 1.7, 2.5], # 8 bins => 9 boundaries
+ "shift": [ 2, 1, 0, 0, -1, -3, -1, 1]
+ }
+ }
+
+ @staticmethod
+ def addVaryingThrValues(thr, pt, shift_set):
+ eta_bin_boundaries = ThresholdDef.eEMVar[shift_set]["eta_bin_boundaries"]
+ shift = ThresholdDef.eEMVar[shift_set]["shift"]
+ thr.addThrValue(pt+shift[0], priority=1)
+ for idx,sh in reversed(list(enumerate(shift))):
+ eta_min = int(10 * eta_bin_boundaries[idx])
+ eta_max = int(10 * eta_bin_boundaries[idx+1])
+ thr.addThrValue( pt + sh, -eta_max, -eta_min, priority=2)
+ for idx,sh in enumerate(shift):
+ eta_min = int(10 * eta_bin_boundaries[idx])
+ eta_max = int(10 * eta_bin_boundaries[idx+1])
+ thr.addThrValue( pt + sh, eta_min, eta_max, priority=2)
+ return thr
+
+
@staticmethod
def registerThresholds(tc, menuName):
@@ -114,16 +137,17 @@ class ThresholdDef:
.addThrValue(19, -17, -16, priority=2).addThrValue(19, 16, 17, priority=2)\
.addThrValue(21, -25, -18, priority=2).addThrValue(21, 18, 25, priority=2)
- EMThreshold( 'eEM22VHI', 'eEM').setIsolation( reta = "Loose", wstot = "Medium" )\
- .addThrValue(24, priority=1)\
- .addThrValue(24, -7, 7, priority=2)\
- .addThrValue(23, -8, -8, priority=2).addThrValue(23, 8, 8, priority=2)\
- .addThrValue(22, -11, -9, priority=2).addThrValue(22, 9, 11, priority=2)\
- .addThrValue(21, -13, -12, priority=2).addThrValue(21, 12, 13, priority=2)\
- .addThrValue(20, -14, -14, priority=2).addThrValue(20, 14, 14, priority=2)\
- .addThrValue(19, -15, -15, priority=2).addThrValue(19, 15, 15, priority=2)\
- .addThrValue(21, -17, -16, priority=2).addThrValue(21, 16, 17, priority=2)\
- .addThrValue(23, -25, -18, priority=2).addThrValue(23, 18, 25, priority=2)
+ ThresholdDef.addVaryingThrValues(EMThreshold('eEM22VHI', 'eEM').setIsolation(reta="Loose", wstot="Medium"), pt=22, shift_set=1)
+ # EMThreshold( 'eEM22VHI', 'eEM').setIsolation( reta = "Loose", wstot = "Medium" )\
+ # .addThrValue(24, priority=1)\
+ # .addThrValue(24, -7, 7, priority=2)\
+ # .addThrValue(23, -8, -8, priority=2).addThrValue(23, 8, 8, priority=2)\
+ # .addThrValue(22, -11, -9, priority=2).addThrValue(22, 9, 11, priority=2)\
+ # .addThrValue(21, -13, -12, priority=2).addThrValue(21, 12, 13, priority=2)\
+ # .addThrValue(20, -14, -14, priority=2).addThrValue(20, 14, 14, priority=2)\
+ # .addThrValue(19, -15, -15, priority=2).addThrValue(19, 15, 15, priority=2)\
+ # .addThrValue(21, -17, -16, priority=2).addThrValue(21, 16, 17, priority=2)\
+ # .addThrValue(23, -25, -18, priority=2).addThrValue(23, 18, 25, priority=2)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
index e1c9903f3ed027f91bd10a38d0df502697b46ede..da829965655ab330c71e51040c1fa7b6b8bca7c5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
@@ -8,9 +8,38 @@ class ThresholdDefLegacy:
alreadyExecuted = False
+ EMVarRun2 = {
+ 1 : {
+ "eta_bin_boundaries": [0, 0.8, 1.1, 1.4, 1.5, 1.8, 2.5], # 6 bins
+ "shift": [ 1, -1, -2, -3, -1, 0]
+ },
+ 2 : {
+ "eta_bin_boundaries": [0, 0.7, 0.9, 1.2, 1.4, 1.5, 1.7, 2.5], # 7 bins
+ "shift": [ 2, 1, 0, -1, -2, 0, 1]
+ },
+ 3 : {
+ "eta_bin_boundaries": [0, 0.7, 0.8, 1.1, 1.3, 1.4, 1.5, 1.7, 2.5], # 8 bins
+ "shift" : [ 2, 1, 0, -1, -2, -3, -1, 1]
+ }
+ }
+
@staticmethod
- def registerThresholds(tc, menuName):
+ def addVaryingThrValuesRun2(thr, pt, shift_set):
+ eta_bin_boundaries = ThresholdDefLegacy.EMVarRun2[shift_set]["eta_bin_boundaries"]
+ shift = ThresholdDefLegacy.EMVarRun2[shift_set]["shift"]
+ thr.addThrValue(pt+shift[0], priority=1)
+ for idx,sh in reversed(list(enumerate(shift))[1:]):
+ eta_min = int(10 * eta_bin_boundaries[idx])
+ eta_max = int(10 * eta_bin_boundaries[idx+1])
+ thr.addThrValue( pt + sh, -eta_max, -eta_min, priority=2)
+ for idx,sh in list(enumerate(shift))[1:]:
+ eta_min = int(10 * eta_bin_boundaries[idx])
+ eta_max = int(10 * eta_bin_boundaries[idx+1])
+ thr.addThrValue( pt + sh, eta_min, eta_max, priority=2)
+ return thr
+ @staticmethod
+ def registerThresholds(tc, menuName):
# dear Menu Experts, please note that it is only necessary to
# check the menu name if a certain threshold has different
# definitions in different menus
@@ -20,7 +49,6 @@ class ThresholdDefLegacy:
ThresholdDefLegacy.alreadyExecuted = True
# EM
-
ThresholdValue.setDefaults('EM',{'isobits' : '00000', 'use_relIso' : True })
for thrV in [3, 5, 7, 8, 10, 12, 14, 15, 16, 18, 20, 22]:
@@ -35,185 +63,42 @@ class ThresholdDefLegacy:
# em isolation (I)
# I section
-
ThresholdValue.setDefaults('EM', {'isobits' : '00010', 'use_relIso' : True })
-
for thrV in [8]:
LegacyThreshold('EM%iI' % thrV, 'EM').addThrValue(thrV)
# VH section
-
ThresholdValue.setDefaults('EM', {'isobits' : '00001', 'use_relIso' : True })
-
- LegacyThreshold( 'EM8VH', 'EM').addThrValue(9, priority=1)\
- .addThrValue(8, -25, -18, priority=2).addThrValue(7, -18, -15, priority=2)\
- .addThrValue(5, -15, -14, priority=2).addThrValue(6, -14, -11, priority=2)\
- .addThrValue(7, -11, -8, priority=2).addThrValue(9, -8, 0, priority=2)\
- .addThrValue(9, 0, 8, priority=2).addThrValue(7, 8, 11, priority=2)\
- .addThrValue(6, 11, 14, priority=2).addThrValue(5, 14, 15, priority=2)\
- .addThrValue(7, 15, 18, priority=2).addThrValue(8, 18, 25, priority=2)
-
- LegacyThreshold( 'EM10VH', 'EM').addThrValue(11, priority=1)\
- .addThrValue(10, -25, -18, priority=2).addThrValue(9, -18, -15, priority=2)\
- .addThrValue(7, -15, -14, priority=2).addThrValue(8, -14, -11, priority=2)\
- .addThrValue(9, -11, -8, priority=2).addThrValue(11, -8, 0, priority=2)\
- .addThrValue(11, 0, 8, priority=2).addThrValue(9, 8, 11, priority=2)\
- .addThrValue(8, 11, 14, priority=2).addThrValue(7, 14, 15, priority=2)\
- .addThrValue(9, 15, 18, priority=2).addThrValue(10, 18, 25, priority=2)
-
- LegacyThreshold( 'EM13VH', 'EM').addThrValue(15, priority=1)\
- .addThrValue(14, -25, -17, priority=2).addThrValue(13, -17, -15, priority=2)\
- .addThrValue(11, -15, -14, priority=2).addThrValue(12, -14, -12, priority=2)\
- .addThrValue(13, -12, -9, priority=2).addThrValue(14, -9, -7, priority=2)\
- .addThrValue(15, -7, 0, priority=2).addThrValue(15, 0, 7, priority=2)\
- .addThrValue(14, 7, 9, priority=2).addThrValue(13, 9, 12, priority=2)\
- .addThrValue(12, 12, 14, priority=2).addThrValue(11, 14, 15, priority=2)\
- .addThrValue(13, 15, 17, priority=2).addThrValue(14, 17, 25, priority=2)
-
- LegacyThreshold( 'EM15VH', 'EM').addThrValue(17, priority=1)\
- .addThrValue(16, -25, -17, priority=2).addThrValue(15, -17, -15, priority=2)\
- .addThrValue(13, -15, -14, priority=2).addThrValue(14, -14, -12, priority=2)\
- .addThrValue(15, -12, -9, priority=2).addThrValue(16, -9, -7, priority=2)\
- .addThrValue(17, -7, 0, priority=2).addThrValue(17, 0, 7, priority=2)\
- .addThrValue(16, 7, 9, priority=2).addThrValue(15, 9, 12, priority=2)\
- .addThrValue(14, 12, 14, priority=2).addThrValue(13, 14, 15, priority=2)\
- .addThrValue(15, 15, 17, priority=2).addThrValue(16, 17, 25, priority=2)
-
- LegacyThreshold( 'EM18VH', 'EM').addThrValue(20, priority=1)\
- .addThrValue(19, -25, -17, priority=2).addThrValue(17, -17, -15, priority=2)\
- .addThrValue(15, -15, -14, priority=2).addThrValue(16, -14, -13, priority=2)\
- .addThrValue(17, -13, -11, priority=2).addThrValue(18, -11, -8, priority=2)\
- .addThrValue(19, -8, -7, priority=2).addThrValue(20, -7, 0, priority=2)\
- .addThrValue(20, 0, 7, priority=2).addThrValue(19, 7, 8, priority=2)\
- .addThrValue(18, 8, 11, priority=2).addThrValue(17, 11, 13, priority=2)\
- .addThrValue(16, 13, 14, priority=2).addThrValue(15, 14, 15, priority=2)\
- .addThrValue(17, 15, 17, priority=2).addThrValue(19, 17, 25, priority=2)
-
- LegacyThreshold( 'EM20VH', 'EM').addThrValue(22, priority=1)\
- .addThrValue(21, -25, -17, priority=2).addThrValue(19, -17, -15, priority=2)\
- .addThrValue(17, -15, -14, priority=2).addThrValue(18, -14, -13, priority=2)\
- .addThrValue(19, -13, -11, priority=2).addThrValue(20, -11, -8, priority=2)\
- .addThrValue(21, -8, -7, priority=2).addThrValue(22, -7, 0, priority=2)\
- .addThrValue(22, 0, 7, priority=2).addThrValue(21, 7, 8, priority=2)\
- .addThrValue(20, 8, 11, priority=2).addThrValue(19, 11, 13, priority=2)\
- .addThrValue(18, 13, 14, priority=2).addThrValue(17, 14, 15, priority=2)\
- .addThrValue(19, 15, 17, priority=2).addThrValue(21, 17, 25, priority=2)
-
- LegacyThreshold( 'EM22VH', 'EM').addThrValue(24, priority=1)\
- .addThrValue(23, -25, -17, priority=2).addThrValue(21, -17, -15, priority=2)\
- .addThrValue(19, -15, -14, priority=2).addThrValue(20, -14, -13, priority=2)\
- .addThrValue(21, -13, -11, priority=2).addThrValue(22, -11, -8, priority=2)\
- .addThrValue(23, -8, -7, priority=2).addThrValue(24, -7, 0, priority=2)\
- .addThrValue(24, 0, 7, priority=2).addThrValue(23, 7, 8, priority=2)\
- .addThrValue(22, 8, 11, priority=2).addThrValue(21, 11, 13, priority=2)\
- .addThrValue(20, 13, 14, priority=2).addThrValue(19, 14, 15, priority=2)\
- .addThrValue(21, 15, 17, priority=2).addThrValue(23, 17, 25, priority=2)
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM8VH', 'EM'), 8, shift_set = 1 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM10VH', 'EM'), 10, shift_set = 1 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM13VH', 'EM'), 13, shift_set = 2 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM15VH', 'EM'), 15, shift_set = 2 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM18VH', 'EM'), 18, shift_set = 3 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM20VH', 'EM'), 20, shift_set = 3 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM22VH', 'EM'), 22, shift_set = 3 )
# (V)HI section
-
ThresholdValue.setDefaults('EM', {'isobits' : '00100', 'use_relIso' : True })
-
for thrV in [15]:
LegacyThreshold('EM%iHI' % thrV, 'EM').addThrValue(thrV)
- LegacyThreshold( 'EM15VHI', 'EM').addThrValue(17, priority=1)\
- .addThrValue(16, -25, -17, priority=2).addThrValue(15, -17, -15, priority=2)\
- .addThrValue(13, -15, -14, priority=2).addThrValue(14, -14, -12, priority=2)\
- .addThrValue(15, -12, -9, priority=2).addThrValue(16, -9, -7, priority=2)\
- .addThrValue(17, -7, 0, priority=2).addThrValue(17, 0, 7, priority=2)\
- .addThrValue(16, 7, 9, priority=2).addThrValue(15, 9, 12, priority=2)\
- .addThrValue(14, 12, 14, priority=2).addThrValue(13, 14, 15, priority=2)\
- .addThrValue(15, 15, 17, priority=2).addThrValue(16, 17, 25, priority=2)
-
- LegacyThreshold( 'EM18VHI', 'EM').addThrValue(20, priority=1)\
- .addThrValue(19, -25, -17, priority=2).addThrValue(17, -17, -15, priority=2)\
- .addThrValue(15, -15, -14, priority=2).addThrValue(16, -14, -13, priority=2)\
- .addThrValue(17, -13, -11, priority=2).addThrValue(18, -11, -8, priority=2)\
- .addThrValue(19, -8, -7, priority=2).addThrValue(20, -7, 0, priority=2)\
- .addThrValue(20, 0, 7, priority=2).addThrValue(19, 7, 8, priority=2)\
- .addThrValue(18, 8, 11, priority=2).addThrValue(17, 11, 13, priority=2)\
- .addThrValue(16, 13, 14, priority=2).addThrValue(15, 14, 15, priority=2)\
- .addThrValue(17, 15, 17, priority=2).addThrValue(19, 17, 25, priority=2)
-
-
- LegacyThreshold( 'EM20VHI', 'EM').addThrValue(22, priority=1)\
- .addThrValue(21, -25, -17, priority=2).addThrValue(19, -17, -15, priority=2)\
- .addThrValue(17, -15, -14, priority=2).addThrValue(18, -14, -13, priority=2)\
- .addThrValue(19, -13, -11, priority=2).addThrValue(20, -11, -8, priority=2)\
- .addThrValue(21, -8, -7, priority=2).addThrValue(22, -7, 0, priority=2)\
- .addThrValue(22, 0, 7, priority=2).addThrValue(21, 7, 8, priority=2)\
- .addThrValue(20, 8, 11, priority=2).addThrValue(19, 11, 13, priority=2)\
- .addThrValue(18, 13, 14, priority=2).addThrValue(17, 14, 15, priority=2)\
- .addThrValue(19, 15, 17, priority=2).addThrValue(21, 17, 25, priority=2)
-
- LegacyThreshold( 'EM22VHI', 'EM').addThrValue(24, priority=1)\
- .addThrValue(23, -25, -17, priority=2).addThrValue(21, -17, -15, priority=2)\
- .addThrValue(19, -15, -14, priority=2).addThrValue(20, -14, -13, priority=2)\
- .addThrValue(21, -13, -11, priority=2).addThrValue(22, -11, -8, priority=2)\
- .addThrValue(23, -8, -7, priority=2).addThrValue(24, -7, 0, priority=2)\
- .addThrValue(24, 0, 7, priority=2).addThrValue(23, 7, 8, priority=2)\
- .addThrValue(22, 8, 11, priority=2).addThrValue(21, 11, 13, priority=2)\
- .addThrValue(20, 13, 14, priority=2).addThrValue(19, 14, 15, priority=2)\
- .addThrValue(21, 15, 17, priority=2).addThrValue(23, 17, 25, priority=2)
-
- LegacyThreshold( 'EM24VHI', 'EM').addThrValue(24, priority=1)\
- .addThrValue(25, -25, -17, priority=2).addThrValue(23, -17, -15, priority=2)\
- .addThrValue(21, -15, -14, priority=2).addThrValue(22, -14, -13, priority=2)\
- .addThrValue(23, -13, -11, priority=2).addThrValue(24, -11, -8, priority=2)\
- .addThrValue(25, -8, -7, priority=2).addThrValue(26, -7, 0, priority=2)\
- .addThrValue(26, 0, 7, priority=2).addThrValue(25, 7, 8, priority=2)\
- .addThrValue(24, 8, 11, priority=2).addThrValue(23, 11, 13, priority=2)\
- .addThrValue(22, 13, 14, priority=2).addThrValue(21, 14, 15, priority=2)\
- .addThrValue(23, 15, 17, priority=2).addThrValue(25, 17, 25, priority=2)
-
- LegacyThreshold( 'EM26VHI', 'EM').addThrValue(26, priority=1)\
- .addThrValue(27, -25, -17, priority=2).addThrValue(25, -17, -15, priority=2)\
- .addThrValue(23, -15, -14, priority=2).addThrValue(24, -14, -13, priority=2)\
- .addThrValue(25, -13, -11, priority=2).addThrValue(26, -11, -8, priority=2)\
- .addThrValue(27, -8, -7, priority=2).addThrValue(28, -7, 0, priority=2)\
- .addThrValue(28, 0, 7, priority=2).addThrValue(27, 7, 8, priority=2)\
- .addThrValue(26, 8, 11, priority=2).addThrValue(25, 11, 13, priority=2)\
- .addThrValue(24, 13, 14, priority=2).addThrValue(23, 14, 15, priority=2)\
- .addThrValue(25, 15, 17, priority=2).addThrValue(27, 17, 25, priority=2)
-
- LegacyThreshold( 'EM30VHI', 'EM').addThrValue(30, priority=1)\
- .addThrValue(31, -29, -17, priority=2).addThrValue(29, -17, -15, priority=2)\
- .addThrValue(27, -15, -14, priority=2).addThrValue(28, -14, -13, priority=2)\
- .addThrValue(29, -13, -11, priority=2).addThrValue(30, -11, -8, priority=2)\
- .addThrValue(31, -8, -7, priority=2).addThrValue(32, -7, 0, priority=2)\
- .addThrValue(32, 0, 7, priority=2).addThrValue(31, 7, 8, priority=2)\
- .addThrValue(30, 8, 11, priority=2).addThrValue(29, 11, 13, priority=2)\
- .addThrValue(28, 13, 14, priority=2).addThrValue(27, 14, 15, priority=2)\
- .addThrValue(29, 15, 17, priority=2).addThrValue(31, 17, 29, priority=2)
-
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM15VHI', 'EM'), 15, shift_set = 2 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM18VHI', 'EM'), 18, shift_set = 3 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM20VHI', 'EM'), 20, shift_set = 3 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM22VHI', 'EM'), 22, shift_set = 3 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM24VHI', 'EM'), 24, shift_set = 3 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM26VHI', 'EM'), 26, shift_set = 3 )
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM30VHI', 'EM'), 30, shift_set = 3 )
# VHIM section
-
ThresholdValue.setDefaults('EM', {'isobits' : '01000', 'use_relIso' : True })
-
- LegacyThreshold( 'EM24VHIM', 'EM').addThrValue(24, priority=1)\
- .addThrValue(25, -25, -17, priority=2).addThrValue(23, -17, -15, priority=2)\
- .addThrValue(21, -15, -14, priority=2).addThrValue(22, -14, -13, priority=2)\
- .addThrValue(23, -13, -11, priority=2).addThrValue(24, -11, -8, priority=2)\
- .addThrValue(25, -8, -7, priority=2).addThrValue(26, -7, 0, priority=2)\
- .addThrValue(26, 0, 7, priority=2).addThrValue(25, 7, 8, priority=2)\
- .addThrValue(24, 8, 11, priority=2).addThrValue(23, 11, 13, priority=2)\
- .addThrValue(22, 13, 14, priority=2).addThrValue(21, 14, 15, priority=2)\
- .addThrValue(23, 15, 17, priority=2).addThrValue(25, 17, 25, priority=2)
-
- ThresholdValue.setDefaults('EM', {'isobits' : '00100', 'use_relIso' : True })
+ ThresholdDefLegacy.addVaryingThrValuesRun2( LegacyThreshold( 'EM24VHIM', 'EM'), 24, shift_set = 3 )
ThresholdValue.setDefaults('EM', {})
-
-
-
-
# TAU
-
ThresholdValue.setDefaults('TAU',{'isobits' : '00000', 'use_relIso' : True })
-
for thrV in [1, 2, 3, 5, 6, 8, 12, 15, 20, 25, 30, 35, 40, 50, 60, 90, 100]:
LegacyThreshold('HA%i' % thrV, 'TAU').addThrValue(thrV)
@@ -339,9 +224,3 @@ class ThresholdDefLegacy:
etamax = 49
for thrV in [3, 7, 500, 600, 1500, 3000, 3500, 5000, 6500, 8000, 9000]:
LegacyThreshold('TE%i.0ETA%i' % (thrV, etamax), 'TE').addThrValue(CL.EtSumOff).addThrValue( thrV, etamin = -etamax, etamax = etamax, priority=1)
-
-
-
-
-
-