diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index eb6012597e40e8724982124433873aa313782f37..2c17033958167bda6b6f5b2518b3c650fd664868 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -30781,6 +30781,48 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
2: 56
3: 56
4: 8
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30:
+ eventCount: 1
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 1
+ stepFeatures:
+ 0: 53
+ 1: 53
+ 2: 53
+ 3: 53
+ 4: 8
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40:
+ eventCount: 1
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 1
+ stepFeatures:
+ 0: 53
+ 1: 53
+ 2: 53
+ 3: 53
+ 4: 8
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50:
+ eventCount: 1
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 1
+ stepFeatures:
+ 0: 53
+ 1: 53
+ 2: 53
+ 3: 53
+ 4: 8
HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
eventCount: 1
stepCounts:
@@ -31724,6 +31766,45 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
2: 51
3: 51
4: 5
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30:
+ eventCount: 0
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ stepFeatures:
+ 0: 48
+ 1: 48
+ 2: 48
+ 3: 48
+ 4: 5
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40:
+ eventCount: 0
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ stepFeatures:
+ 0: 48
+ 1: 48
+ 2: 48
+ 3: 48
+ 4: 5
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50:
+ eventCount: 0
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ stepFeatures:
+ 0: 48
+ 1: 48
+ 2: 48
+ 3: 48
+ 4: 5
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
eventCount: 0
stepCounts:
@@ -31776,6 +31857,19 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cT
2: 51
3: 51
4: 5
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_3jJ30p0ETA25:
+ eventCount: 0
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ stepFeatures:
+ 0: 48
+ 1: 48
+ 2: 48
+ 3: 48
+ 4: 5
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_4jJ30p0ETA25:
eventCount: 0
stepCounts:
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index 6b166b450ea535608a76b48d1c83d9b5a220d844..c4bdfbc80cd83a6594ef601f7ee34f16ce1b0c38 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -15295,6 +15295,42 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
1: 6
2: 6
3: 6
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
eventCount: 0
stepCounts:
@@ -15798,6 +15834,42 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
1: 6
2: 6
3: 6
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
eventCount: 0
stepCounts:
@@ -15836,6 +15908,18 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cT
1: 14
2: 14
3: 14
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_3jJ30p0ETA25:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_4jJ30p0ETA25:
eventCount: 0
HLT_tau35_perf_tracktwoMVA_L1TAU20IM:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
index 7efb131f69c9eec9a0f30a49644106824bb5f093..08abed553e369b67359979bd9e78c71059499c0e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
@@ -1045,7 +1045,6 @@ def getDevSignatures():
ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_4j20c_020jvt_SHARED_j20c_020jvt_bgn185_pf_ftf_L1TAU20IM_2TAU12IM_4J12p0ETA25', l1SeedThresholds=['TAU20IM','TAU12IM']+2*['FSNOSEED'], stream=['VBFDelayed'], groups=DevGroup+TauBJetGroup),
ChainProp(name='HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_4j20c_020jvt_SHARED_j20c_020jvt_bgn185_pf_ftf_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55', l1SeedThresholds=['cTAU30M','cTAU20M']+2*['FSNOSEED'], stream=['VBFDelayed'], groups=DevGroup+TauBJetGroup+Topo2Group),
-
# b+τ test chains for HH→bbττ
# this is a scan in
# τ pₜ: [ 20 , 25 , 35 ]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
index 0b08c8ab5461aea7b43a8ff15c1b56b03bad35f3..1b7ea2d7e3809032bd5ceb688ad93abf0bc56736 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
@@ -760,6 +760,17 @@ def getMCSignatures():
ChainProp(name="HLT_tau25_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=MultiTauGroup+LegacyTopoGroup),
ChainProp(name="HLT_tau30_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=MultiTauGroup+LegacyTopoGroup),
ChainProp(name="HLT_tau30_idperf_tracktwoMVA_tau20_idperf_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=MultiTauGroup+LegacyTopoGroup),
+
+
+ #ATR-29439
+ ChainProp(name='HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_3jJ30p0ETA25' , l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+
]
chains['Calib'] = [
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
index 6d64b44e5b562a5cf7908d39355842be336108de..2c445b0c8ce2a2572b894c84fca38182ab01fb5a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
@@ -513,7 +513,10 @@ class ItemDef:
MenuItem('L1_eTAU80_2eTAU60').setLogic(d.eTAU80 & d.eTAU60.x(2) & physcond).setTriggerType(TT.calo)
MenuItem('L1_cTAU30M_2cTAU20M_4jJ30p0ETA25').setLogic(d.cTAU30M & d.cTAU20M.x(2) & d.jJ300ETA25.x(4) & physcond).setTriggerType(TT.calo)
MenuItem('L1_cTAU35M_2cTAU30M_2jJ55_3jJ50').setLogic(d.cTAU35M & d.cTAU30M.x(2) & d.jJ55.x(2) & d.jJ50.x(3) & physcond).setTriggerType(TT.calo)
+ # ATR-29439
+ MenuItem('L1_cTAU30M_2cTAU20M_3jJ30p0ETA25').setLogic(d.cTAU30M & d.cTAU20M.x(2) & d.jJ300ETA25.x(3) & physcond).setTriggerType(TT.calo)
+
#UPC TAU
MenuItem('L1_2TAU1_VTE50' ).setLogic( d.HA1.x(2) & Not(d.TE50) & physcond).setTriggerType(TT.calo)
MenuItem('L1_2TAU2_VTE50' ).setLogic( d.HA2.x(2) & Not(d.TE50) & physcond).setTriggerType(TT.calo)
@@ -1896,7 +1899,12 @@ class ItemDef:
MenuItem('L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55').setLogic( d.cTAU30M & d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ55ab_0DR28_eTAU30ab_eTAU20ab & physcond)
MenuItem('L1_cTAU20M_DR-eTAU20eTAU12-jJ40').setLogic( d.cTAU20M & d.TOPO_2DISAMB_jJ40ab_0DR10_eTAU20ab_eTAU12ab & physcond)
MenuItem('L1_eTAU80_2cTAU30M_DR-eTAU30eTAU20').setLogic( d.eTAU80 & d.cTAU30M.x(2) & d.TOPO_0DR28_eTAU30ab_eTAU20ab & physcond)
-
+ # ATR-29439
+ MenuItem('L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50').setLogic( d.cTAU30M & d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ50ab_0DR28_eTAU30ab_eTAU20ab & physcond)
+ MenuItem('L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40').setLogic( d.cTAU30M & d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ40ab_0DR28_eTAU30ab_eTAU20ab & physcond)
+ MenuItem('L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30').setLogic( d.cTAU30M & d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ30ab_0DR28_eTAU30ab_eTAU20ab & physcond)
+
+
# ATR-26902
MenuItem('L1_2cTAU20M_4DR28-eTAU30eTAU20-jJ55').setLogic ( d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ55ab_4DR28_eTAU30ab_eTAU20ab & physcond)
MenuItem('L1_2cTAU20M_4DR32-eTAU30eTAU20-jJ55').setLogic ( d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ55ab_4DR32_eTAU30ab_eTAU20ab & physcond)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
index b3fd46d012a07b3aad1253753a43ce143ef2ef34..36bd32ba665bfa3860e24cf0088f97b0caada2f1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
@@ -1350,8 +1350,14 @@ class TopoAlgoDef:
# DISAMB Lines with DR Cut
- # output lines = 2DISAMB-jJ55ab-0DR25-eTAU30ab-eTAU20ab'
- # '2DISAMB-jJ55ab-0DR28-eTAU30ab-eTAU20ab',
+ # output lines = '2DISAMB-jJ55ab-0DR25-eTAU30ab-eTAU20ab'
+ # '2DISAMB-jJ55ab-0DR28-eTAU30ab-eTAU20ab'
+ # '2DISAMB-jJ50ab-0DR25-eTAU30ab-eTAU20ab',
+ # '2DISAMB-jJ50ab-0DR28-eTAU30ab-eTAU20ab',
+ # '2DISAMB-jJ40ab-0DR25-eTAU30ab-eTAU20ab',
+ # '2DISAMB-jJ40ab-0DR28-eTAU30ab-eTAU20ab',
+ # '2DISAMB-jJ30ab-0DR25-eTAU30ab-eTAU20ab',
+ # '2DISAMB-jJ30ab-0DR28-eTAU30ab-eTAU20ab']
DISAMB_DR_jJ_eTau_eTau_Map = [
{
"algoname": "2DISAMB_jJ55ab_DR_eTAU_eTAU",
@@ -1373,6 +1379,69 @@ class TopoAlgoDef:
"nleading3": HW.jJetOutputWidthSelect,
"inputwidth3": HW.jJetOutputWidthSelect,
"olist3": "ab",
+ },
+ {
+ "algoname": "2DISAMB_jJ50ab_DR_eTAU_eTAU",
+ "disamb" : 2,
+ "minDR" : 0,
+ "maxDR" : [25,28],
+ "otype1" : "eTAU",
+ "ocut1" : 30,
+ "olist1": "ab",
+ "nleading1": HW.eTauOutputWidthSelect,
+ "inputwidth1": HW.eTauOutputWidthSelect,
+ "otype2" : "eTAU",
+ "ocut2" : 20,
+ "nleading2": HW.eTauOutputWidthSelect,
+ "inputwidth2": HW.eTauOutputWidthSelect,
+ "olist2": "ab",
+ "otype3" : "jJ",
+ "ocut3" : 50,
+ "nleading3": HW.jJetOutputWidthSelect,
+ "inputwidth3": HW.jJetOutputWidthSelect,
+ "olist3": "ab",
+ },
+ {
+ "algoname": "2DISAMB_jJ40ab_DR_eTAU_eTAU",
+ "disamb" : 2,
+ "minDR" : 0,
+ "maxDR" : [25, 28],
+ "otype1" : "eTAU",
+ "ocut1" : 30,
+ "olist1": "ab",
+ "nleading1": HW.eTauOutputWidthSelect,
+ "inputwidth1": HW.eTauOutputWidthSelect,
+ "otype2" : "eTAU",
+ "ocut2" : 20,
+ "nleading2": HW.eTauOutputWidthSelect,
+ "inputwidth2": HW.eTauOutputWidthSelect,
+ "olist2": "ab",
+ "otype3" : "jJ",
+ "ocut3" : 40,
+ "nleading3": HW.jJetOutputWidthSelect,
+ "inputwidth3": HW.jJetOutputWidthSelect,
+ "olist3": "ab",
+ },
+ {
+ "algoname": "2DISAMB_jJ30ab_DR_eTAU_eTAU",
+ "disamb" : 2,
+ "minDR" : 0,
+ "maxDR" : [25, 28],
+ "otype1" : "eTAU",
+ "ocut1" : 30,
+ "olist1": "ab",
+ "nleading1": HW.eTauOutputWidthSelect,
+ "inputwidth1": HW.eTauOutputWidthSelect,
+ "otype2" : "eTAU",
+ "ocut2" : 20,
+ "nleading2": HW.eTauOutputWidthSelect,
+ "inputwidth2": HW.eTauOutputWidthSelect,
+ "olist2": "ab",
+ "otype3" : "jJ",
+ "ocut3" : 30,
+ "nleading3": HW.jJetOutputWidthSelect,
+ "inputwidth3": HW.jJetOutputWidthSelect,
+ "olist3": "ab",
}
]
for x in DISAMB_DR_jJ_eTau_eTau_Map:
@@ -1390,7 +1459,6 @@ class TopoAlgoDef:
obj3, d.minDR, d.maxDR[bitId], obj1, obj2))
alg = AlgConf.DisambiguationDRIncl3( name = d.algoname, inputs = inputList, outputs = toponames )
-
alg.addgeneric('InputWidth1', d.inputwidth1)
alg.addgeneric('InputWidth2', d.inputwidth2)
alg.addgeneric('InputWidth3', d.inputwidth3)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py
index d20f5319a6bf17460574f0d41dc8a26d2be89ac8..792034faf0b335a87f050ae33e34c61e29f7115d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py
@@ -73,6 +73,11 @@ def defineMenu():
'L1_cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20',
'L1_cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12',
'L1_cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_10DPHI99-eTAU30eTAU12',
+ #ATR-29439
+ 'L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50',
+ 'L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40',
+ 'L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30',
+ 'L1_cTAU30M_2cTAU20M_3jJ30p0ETA25',
#ATR-27252
'L1_eTAU60_2cTAU20M_jXE80',
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py
index f39bc031585b7ff253cb2656df958b9ae1270ca1..7c932e0d3aec4ae42ac4cbecd64bfef6bbc98d59 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py
@@ -54,7 +54,18 @@ def defineInputsMenu():
'0INVM70-2DR15-eEM12sl1-eEM12sl6']),
TopoMenuDef( 'INVM_BOOSTDR_Ranges_Asymm_eEMsl6', outputbits = (12,13), outputlines = ['0INVM30-2DR15-eEM12sl1-eEM9sl6',
- '25INVM70-13DR25-eEM12sl1-eEM9sl6']),
+ '25INVM70-13DR25-eEM12sl1-eEM9sl6']),
+ ]
+ if conn["name"] == "Topo3El":
+ for group in conn["algorithmGroups"]:
+ if group["fpga"]==0 and group["clock"]==1:
+ group["algorithms"] += [
+ TopoMenuDef( '2DISAMB_jJ50ab_DR_eTAU_eTAU', outputbits = (10,11), outputlines = ['2DISAMB-jJ50ab-0DR25-eTAU30ab-eTAU20ab',
+ '2DISAMB-jJ50ab-0DR28-eTAU30ab-eTAU20ab']),
+ TopoMenuDef( '2DISAMB_jJ40ab_DR_eTAU_eTAU', outputbits = (12,13), outputlines = ['2DISAMB-jJ40ab-0DR25-eTAU30ab-eTAU20ab',
+ '2DISAMB-jJ40ab-0DR28-eTAU30ab-eTAU20ab']),
+ TopoMenuDef( '2DISAMB_jJ30ab_DR_eTAU_eTAU', outputbits = (14,15), outputlines = ['2DISAMB-jJ30ab-0DR25-eTAU30ab-eTAU20ab',
+ '2DISAMB-jJ30ab-0DR28-eTAU30ab-eTAU20ab']),
]
#----------------------------------------------