diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 94d030e48011cc38fb72e3d500e83395ba919e83..a17147e56e334db7e8204c7aa90712db0e2d1cc5 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -675,24 +675,24 @@ HLT_2mu4_noL2Comb_bJpsimumu_L12MU3V:
2: 10
3: 8
4: 8
-HLT_2mu50_msonly_L1MU14FCH:
- eventCount: 0
- stepCounts:
- 0: 1
- stepFeatures:
- 0: 2
-HLT_2mu6_10invm70_L1MU5VF:
- eventCount: 2
+HLT_2mu4_os_dRAA12_L1BPH-0DR12C-2MU3V:
+ eventCount: 1
stepCounts:
0: 3
1: 3
2: 3
- 3: 2
+ 3: 1
stepFeatures:
0: 6
1: 6
- 2: 8
- 3: 7
+ 2: 10
+ 3: 8
+HLT_2mu50_msonly_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ stepFeatures:
+ 0: 2
HLT_2mu6_10invmAA70_L1MU5VF:
eventCount: 2
stepCounts:
@@ -949,6 +949,10 @@ HLT_3j65_0eta290_020jvt_pf_ftf_bdl1r85_L1J45p0ETA21_3J15p0ETA25:
0: 12
1: 20
2: 7
+HLT_3mu4_L1BPH-0M10-3MU3V:
+ eventCount: 0
+HLT_3mu4_L1BPH-0M10C-3MU3V:
+ eventCount: 0
HLT_3mu4_bDimu2700_L13MU3V:
eventCount: 0
stepCounts:
@@ -1628,6 +1632,8 @@ HLT_e120_lhvloose_L1EM22VHI:
4: 1
HLT_e12_lhloose_2mu10_L12MU8F:
eventCount: 0
+HLT_e12_lhtight_mu11_dRAB15_invmAB10_L1LFV-eEM8L-MU8VF:
+ eventCount: 0
HLT_e140_dnnloose_L1EM22VHI:
eventCount: 0
HLT_e140_gsf_dnnloose_L1EM22VHI:
@@ -1654,6 +1660,8 @@ HLT_e14_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
eventCount: 0
HLT_e14_lhtight_e4_etcut_probe_1invmAB5_L1JPSI-1M5-EM12:
eventCount: 0
+HLT_e14_lhtight_mu6_dRAB15_invmAB10_L1LFV-eEM12L-MU5VF:
+ eventCount: 0
HLT_e14_lhtight_noringer_e4_etcut_1invmAB5_L1JPSI-1M5-EM12:
eventCount: 0
HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
@@ -7031,7 +7039,7 @@ HLT_mu10_ivarmedium_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
3: 2
4: 1
5: 11
-HLT_mu10_ivarmedium_mu10_10invm70_L12MU8F:
+HLT_mu10_ivarmedium_mu10_10invmAB70_L12MU8F:
eventCount: 1
stepCounts:
0: 2
@@ -7049,7 +7057,9 @@ HLT_mu10_l2mt_mu4_l2mt_bJpsimumu_L1MU10BOM:
eventCount: 0
stepFeatures:
0: 2
-HLT_mu10_lateMu_L1LATE-MU8F_XE50:
+HLT_mu10_lateMu_L1LATE-MU8F_J50:
+ eventCount: 0
+HLT_mu10_lateMu_L1LATE-MU8F_XE30:
eventCount: 0
HLT_mu11_mu6_bBmumu_L1LFV-MU8VF:
eventCount: 0
@@ -7625,7 +7635,7 @@ HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU14FCH:
7: 15
8: 15
9: 6
-HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU14FCH:
+HLT_mu20_ivarmedium_mu4noL1_10invmAB70_L1MU14FCH:
eventCount: 2
stepCounts:
0: 6
@@ -8827,14 +8837,24 @@ HLT_mu6_mu4_L12MU3V:
1: 18
2: 24
3: 17
+HLT_mu6_mu4_bBmumu_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bBmumu_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
+HLT_mu6_mu4_bBmumu_Lxy0_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bBmumu_Lxy0_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
+HLT_mu6_mu4_bBmumux_BpmumuKp_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bBmumux_BpmumuKp_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
+HLT_mu6_mu4_bBmumux_BsmumuPhi_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bBmumux_BsmumuPhi_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
+HLT_mu6_mu4_bDimu_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bDimu_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
HLT_mu6_mu4_bDimu_L1MU5VF_2MU3V:
@@ -8850,8 +8870,12 @@ HLT_mu6_mu4_bDimu_L1MU5VF_2MU3V:
2: 18
3: 15
4: 15
+HLT_mu6_mu4_bJpsimumu_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bJpsimumu_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
+HLT_mu6_mu4_bJpsimumu_Lxy0_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bJpsimumu_Lxy0_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
HLT_mu6_mu4_bUpsimumu_L1BPH-8M15-0DR22-MU5VFMU3V-BO:
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index d72ef10d7fb1b56a6e6d08e03f9fbd8fecb808a5..a5b647448f10165b7c8f0fa1007fb62a40cc8a2d 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -93,18 +93,6 @@ HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j180XXj80_L1J100:
eventCount: 0
HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j225XXj100_L1J100:
eventCount: 0
-HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j135XXj60_L1J100:
- eventCount: 0
-HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j180XXj80_L1J100:
- eventCount: 0
-HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j225XXj100_L1J100:
- eventCount: 0
-HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j135XXj60_L1J100:
- eventCount: 0
-HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j180XXj80_L1J100:
- eventCount: 0
-HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j225XXj100_L1J100:
- eventCount: 0
HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100:
eventCount: 0
HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1SC111-CJ15:
@@ -273,14 +261,14 @@ HLT_2mu4_noL2Comb_bJpsimumu_L12MU3V:
stepFeatures:
0: 2
1: 2
-HLT_2mu50_msonly_L1MU14FCH:
- eventCount: 0
-HLT_2mu6_10invm70_L1MU5VF:
+HLT_2mu4_os_dRAA12_L1BPH-0DR12C-2MU3V:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 2
+HLT_2mu50_msonly_L1MU14FCH:
+ eventCount: 0
HLT_2mu6_10invmAA70_L1MU5VF:
eventCount: 0
stepCounts:
@@ -388,6 +376,10 @@ HLT_3j65_0eta290_020jvt_pf_ftf_bdl1r77_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
HLT_3j65_0eta290_020jvt_pf_ftf_bdl1r85_L1J45p0ETA21_3J15p0ETA25:
eventCount: 0
+HLT_3mu4_L1BPH-0M10-3MU3V:
+ eventCount: 0
+HLT_3mu4_L1BPH-0M10C-3MU3V:
+ eventCount: 0
HLT_3mu4_bDimu2700_L13MU3V:
eventCount: 0
HLT_3mu4_bJpsi_L13MU3V:
@@ -608,6 +600,8 @@ HLT_e120_lhvloose_L1EM22VHI:
eventCount: 0
HLT_e12_lhloose_2mu10_L12MU8F:
eventCount: 0
+HLT_e12_lhtight_mu11_dRAB15_invmAB10_L1LFV-eEM8L-MU8VF:
+ eventCount: 0
HLT_e140_dnnloose_L1EM22VHI:
eventCount: 0
HLT_e140_gsf_dnnloose_L1EM22VHI:
@@ -628,6 +622,8 @@ HLT_e14_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
0: 6
HLT_e14_lhtight_e4_etcut_probe_1invmAB5_L1JPSI-1M5-EM12:
eventCount: 0
+HLT_e14_lhtight_mu6_dRAB15_invmAB10_L1LFV-eEM12L-MU5VF:
+ eventCount: 0
HLT_e14_lhtight_noringer_e4_etcut_1invmAB5_L1JPSI-1M5-EM12:
eventCount: 0
stepFeatures:
@@ -2726,11 +2722,13 @@ HLT_mu10_L1MU8F:
0: 5
HLT_mu10_ivarmedium_j70_0eta320_j50_0eta490_j0_DJMASS900j50_L1MJJ-500-NFF:
eventCount: 0
-HLT_mu10_ivarmedium_mu10_10invm70_L12MU8F:
+HLT_mu10_ivarmedium_mu10_10invmAB70_L12MU8F:
eventCount: 0
HLT_mu10_l2mt_mu4_l2mt_bJpsimumu_L1MU10BOM:
eventCount: 0
-HLT_mu10_lateMu_L1LATE-MU8F_XE50:
+HLT_mu10_lateMu_L1LATE-MU8F_J50:
+ eventCount: 0
+HLT_mu10_lateMu_L1LATE-MU8F_XE30:
eventCount: 0
HLT_mu11_mu6_bBmumu_L1LFV-MU8VF:
eventCount: 0
@@ -2920,7 +2918,7 @@ HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU14FCH:
eventCount: 0
stepFeatures:
0: 1
-HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU14FCH:
+HLT_mu20_ivarmedium_mu4noL1_10invmAB70_L1MU14FCH:
eventCount: 0
stepCounts:
0: 1
@@ -3346,14 +3344,24 @@ HLT_mu6_mu4_L12MU3V:
0: 1
stepFeatures:
0: 4
+HLT_mu6_mu4_bBmumu_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bBmumu_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
+HLT_mu6_mu4_bBmumu_Lxy0_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bBmumu_Lxy0_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
+HLT_mu6_mu4_bBmumux_BpmumuKp_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bBmumux_BpmumuKp_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
+HLT_mu6_mu4_bBmumux_BsmumuPhi_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bBmumux_BsmumuPhi_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
+HLT_mu6_mu4_bDimu_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bDimu_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
HLT_mu6_mu4_bDimu_L1MU5VF_2MU3V:
@@ -3362,8 +3370,12 @@ HLT_mu6_mu4_bDimu_L1MU5VF_2MU3V:
0: 1
stepFeatures:
0: 4
+HLT_mu6_mu4_bJpsimumu_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bJpsimumu_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
+HLT_mu6_mu4_bJpsimumu_Lxy0_L1BPH-2M9-0DR15-C-MU5VFMU3V:
+ eventCount: 0
HLT_mu6_mu4_bJpsimumu_Lxy0_L1BPH-2M9-0DR15-MU5VFMU3V:
eventCount: 0
HLT_mu6_mu4_bUpsimumu_L1BPH-8M15-0DR22-MU5VFMU3V-BO:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index f31e39cd77d9769221561f10b38bcec4b7cb54c1..cf010bd9676775c56438e42ac3d43851b5a85fa5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -86,10 +86,11 @@ def setupMenu():
ChainProp(name='HLT_mu6_msonly_L1MU5VF', groups=SingleMuonGroup, monGroups=['muonMon:shifter','muonMon:val','idMon:t0']),
- ChainProp(name='HLT_2mu6_10invm70_L1MU5VF', groups=SingleMuonGroup),
- # Using generic hypo
ChainProp(name='HLT_2mu6_10invmAA70_L1MU5VF', groups=SingleMuonGroup),
- ChainProp(name='HLT_mu10_lateMu_L1LATE-MU8F_XE50', l1SeedThresholds=['FSNOSEED'], groups=SingleMuonGroup),
+
+ # LATE
+ ChainProp(name='HLT_mu10_lateMu_L1LATE-MU8F_J50', l1SeedThresholds=['FSNOSEED'], groups=SingleMuonGroup+PrimaryL1MuGroup),
+ ChainProp(name='HLT_mu10_lateMu_L1LATE-MU8F_XE30', l1SeedThresholds=['FSNOSEED'], groups=SingleMuonGroup),
# ATR-20049
ChainProp(name='HLT_mu6_mu4_L12MU3V', l1SeedThresholds=['MU3V']*2, groups=MultiMuonGroup),
@@ -154,6 +155,13 @@ def setupMenu():
ChainProp(name='HLT_mu24_ivarmedium_mu6_ivarmedium_probe_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEMU3V'], groups=MultiMuonGroup),
ChainProp(name='HLT_mu24_ivarmedium_mu6_ivarperf_probe_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEMU3V'], groups=MultiMuonGroup),
+ # 3mu inv mass (ATR-19355, ATR-19638), TODO: HLT invm to be added and moved to BLS signature
+ ChainProp(name='HLT_3mu4_L1BPH-0M10-3MU3V', l1SeedThresholds=['MU3V'], stream=["BphysDelayed"], groups=BphysicsGroup),
+ ChainProp(name='HLT_3mu4_L1BPH-0M10C-3MU3V', l1SeedThresholds=['MU3V'], stream=["BphysDelayed"], groups=BphysicsGroup),
+
+ #ATR-21566, di-muon TLA, TODO: TLA implementation and change stream
+ ChainProp(name='HLT_2mu4_os_dRAA12_L1BPH-0DR12C-2MU3V', l1SeedThresholds=['MU3V'], groups=MultiMuonGroup),
+
]
TriggerFlags.EgammaSlice.signatures = TriggerFlags.EgammaSlice.signatures() + [
@@ -931,6 +939,16 @@ def setupMenu():
# RCP multiple candidate
ChainProp(name='HLT_mu10_l2mt_mu4_l2mt_bJpsimumu_L1MU10BOM', l1SeedThresholds=['MU10BOM']*2, stream=["BphysDelayed"], groups=BphysicsGroup),
+
+ # mu6+mu4 chains with L1 charge cut (ATR-19639)
+ ChainProp(name='HLT_mu6_mu4_bBmumux_BsmumuPhi_L1BPH-2M9-0DR15-C-MU5VFMU3V', l1SeedThresholds=['MU5VF','MU3V'], stream=["BphysDelayed"], groups=BphysicsGroup),
+ ChainProp(name='HLT_mu6_mu4_bBmumu_L1BPH-2M9-0DR15-C-MU5VFMU3V', l1SeedThresholds=['MU5VF','MU3V'], stream=["BphysDelayed"], groups=BphysicsGroup),
+ ChainProp(name='HLT_mu6_mu4_bBmumux_BpmumuKp_L1BPH-2M9-0DR15-C-MU5VFMU3V', l1SeedThresholds=['MU5VF','MU3V'], stream=["BphysDelayed"], groups=BphysicsGroup),
+ ChainProp(name='HLT_mu6_mu4_bDimu_L1BPH-2M9-0DR15-C-MU5VFMU3V', l1SeedThresholds=['MU5VF','MU3V'], stream=["BphysDelayed"], groups=BphysicsGroup),
+ ChainProp(name='HLT_mu6_mu4_bJpsimumu_L1BPH-2M9-0DR15-C-MU5VFMU3V', l1SeedThresholds=['MU5VF','MU3V'], stream=["BphysDelayed"], groups=BphysicsGroup),
+ ChainProp(name='HLT_mu6_mu4_bJpsimumu_Lxy0_L1BPH-2M9-0DR15-C-MU5VFMU3V', l1SeedThresholds=['MU5VF','MU3V'], stream=["BphysDelayed"], groups=BphysicsGroup),
+ ChainProp(name='HLT_mu6_mu4_bBmumu_Lxy0_L1BPH-2M9-0DR15-C-MU5VFMU3V', l1SeedThresholds=['MU5VF','MU3V'], stream=["BphysDelayed"], groups=BphysicsGroup),
+
]
TriggerFlags.CombinedSlice.signatures = TriggerFlags.CombinedSlice.signatures() + [
@@ -1104,7 +1122,11 @@ def setupMenu():
#ATR-23156
ChainProp(name='HLT_mu4_j20_0eta290_pf_ftf_boffperf_dRAB03_L1MU3V_J15', l1SeedThresholds=['MU3V','FSNOSEED'], groups=SingleBjetGroup),
ChainProp(name='HLT_mu4_j20_0eta290_pf_ftf_boffperf_dRAB03_L1MU3V', l1SeedThresholds=['MU3V','FSNOSEED'], groups=SingleBjetGroup),
-
+
+ #ATR-23394
+ ChainProp(name='HLT_e14_lhtight_mu6_dRAB15_invmAB10_L1LFV-eEM12L-MU5VF', l1SeedThresholds=['eEM10L','MU5VF'], stream=[PhysicsStream], groups=BphysicsGroup), #TODO: eEM12L->eEM10L in HLT seeding to fix
+ ChainProp(name='HLT_e12_lhtight_mu11_dRAB15_invmAB10_L1LFV-eEM8L-MU8VF', l1SeedThresholds=['eEM8L','MU8VF'], stream=[PhysicsStream], groups=BphysicsGroup),
+
]
TriggerFlags.HeavyIonSlice.signatures = TriggerFlags.HeavyIonSlice.signatures() + []
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
index 5e997b183d80aaff01b883c55bcd3b65e5149a05..6a02ae1e840fba612e3ba648f15889bd3a4cadbd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
@@ -107,10 +107,10 @@ def setupMenu():
ChainProp(name='HLT_2mu15_L12MU8F', groups=PrimaryL1MuGroup+MultiMuonGroup),
ChainProp(name='HLT_mu20_ivarmedium_mu8noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
#ATR-22107
- ChainProp(name='HLT_mu20_ivarmedium_mu4noL1_10invm70_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_mu20_ivarmedium_mu4noL1_10invmAB70_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
#-- 2 mu iso invm
- ChainProp(name='HLT_mu10_ivarmedium_mu10_10invm70_L12MU8F', groups=PrimaryL1MuGroup+MultiMuonGroup),
+ ChainProp(name='HLT_mu10_ivarmedium_mu10_10invmAB70_L12MU8F', groups=PrimaryL1MuGroup+MultiMuonGroup),
#-- 3 mu
ChainProp(name='HLT_mu20_2mu4noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
ChainProp(name='HLT_mu22_2mu4noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 72f12b0b2ed75241328667ed2d74a67a83611def..af05a50e449931522c2d2aa88f4bc33ea20bcffa 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -318,7 +318,7 @@ MuonChainParts = {
'IDinfo' : [],
'isoInfo' : ['ivarloose', 'ivarmedium', 'ivarperf','iloosems'],
'lrtInfo' : ['d0loose','d0medium','d0tight'],
- 'invMassInfo' : ['10invm70', 'invmJPsi'],
+ 'invMassInfo' : ['invmJPsi'],
'msonlyInfo' : ['msonly'],
'addInfo' : ['1step','idperf','LRT','3layersEC','cosmic',"muonqual","nscan","os"],
'topo' : AllowedTopos_mu,
@@ -1034,10 +1034,11 @@ UnconventionalTrackingChainParts_Default = {
# Combined Chains
#==========================================================
AllowedTopos_comb = [
- '03dRAB','03dRAB30','dRAB03','02dRAB','02dRAC','50invmAB','60invmAB','afpdijet','18dphiAB','18dphiAC','80mTAC',
+ 'dRAA12', 'dRAB15', '03dRAB','03dRAB30','dRAB03','02dRAB','02dRAC','50invmAB','60invmAB','afpdijet','18dphiAB','18dphiAC','80mTAC',
'1invmAB5','50invmAB130', # Jpsiee, Zee/Zeg
'25dphiAA','invmAA80', # Low-mass diphoton
'10invmAA70', # Low-mass dimuon
+ 'invmAB10', '10invmAB70',
]
# ---- Combined Dictionary of all allowed Values ----
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
index b4de7426827425d77e050b658efb362f6ffa6005..bb695dae28c8789831f1820fef5e07a6543e092b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
@@ -238,7 +238,6 @@ class ItemDef:
# MUON ctpid=[0x20;0x2f]
# RUn3 thresholds
- MenuItem('L1_MU0' ).setLogic( d.MU0 & physcond).setTriggerType(TT.muon)
MenuItem('L1_MU3V' ).setLogic( d.MU3V & physcond).setTriggerType(TT.muon) # ~ Run2 MU4 eff
MenuItem('L1_MU5VF' ).setLogic( d.MU5VF & physcond).setTriggerType(TT.muon) # ~ Run2 MU6
MenuItem('L1_MU8F' ).setLogic( d.MU8F & physcond).setTriggerType(TT.muon) # ~ Run2 MU10
@@ -253,9 +252,6 @@ class ItemDef:
MenuItem('L1_MU10BOM' ).setLogic( d.MU10BOM & physcond).setTriggerType(TT.muon) # Barrel-only close-by muons
MenuItem('L1_MU20FC' ).setLogic( d.MU20FC & physcond).setTriggerType(TT.muon) # alignment with toroid off
- MenuItem('L1_2MU0' ).setLogic( d.MU0.x(2) & physcond).setTriggerType(TT.muon)
- MenuItem('L1_MU5VF_2MU0' ).setLogic( d.MU5VF & d.MU0.x(2) & physcond).setTriggerType(TT.muon)
-
MenuItem('L1_2MU3V' ).setLogic( d.MU3V.x(2) & physcond).setTriggerType(TT.muon)
MenuItem('L1_2MU5VF' ).setLogic( d.MU5VF.x(2) & physcond).setTriggerType(TT.muon)
MenuItem('L1_2MU8F' ).setLogic( d.MU8F.x(2) & physcond).setTriggerType(TT.muon)
@@ -293,15 +289,9 @@ class ItemDef:
MenuItem('L1_MU3V_TE30p24ETA49' ).setLogic( d.MU3V & d.TE3024ETA49 & physcond).setTriggerType(TT.muon)
MenuItem('L1_MU3V_TE35p24ETA49' ).setLogic( d.MU3V & d.TE3524ETA49 & physcond).setTriggerType(TT.muon)
MenuItem('L1_MU3V_TE40p24ETA49' ).setLogic( d.MU3V & d.TE4024ETA49 & physcond).setTriggerType(TT.muon)
- MenuItem('L1_MU0_VTE50' ).setLogic( d.MU0 & Not(d.TE50) & physcond).setTriggerType(TT.muon)
MenuItem('L1_MU3V_VTE50' ).setLogic( d.MU3V & Not(d.TE50) & physcond).setTriggerType(TT.muon)
MenuItem('L1_MU5VF_VTE50').setLogic( d.MU5VF & Not(d.TE50) & physcond).setTriggerType(TT.muon)
- MenuItem('L1_MU0_UNPAIRED_ISO' ).setLogic(d.MU0 & unpaired_isocond ).setTriggerType( TT.muon )
- MenuItem('L1_MU0_UNPAIRED_NONISO').setLogic(d.MU0 & unpaired_nonisocond).setTriggerType( TT.muon )
- MenuItem('L1_MU0_EMPTY' ).setLogic(d.MU0 & cosmiccond).setTriggerType( TT.muon )
- MenuItem('L1_MU0_FIRSTEMPTY' ).setLogic(d.MU0 & firstempty).setTriggerType( TT.muon )
-
MenuItem('L1_MU3V_UNPAIRED_ISO' ).setLogic(d.MU3V & unpaired_isocond ).setTriggerType( TT.muon )
MenuItem('L1_MU3V_UNPAIRED_NONISO').setLogic(d.MU3V & unpaired_nonisocond).setTriggerType( TT.muon )
MenuItem('L1_MU3V_EMPTY' ).setLogic(d.MU3V & cosmiccond).setTriggerType( TT.muon )
@@ -312,7 +302,6 @@ class ItemDef:
MenuItem('L1_MU8VF_EMPTY' ).setLogic(d.MU8VF & cosmiccond).setTriggerType( TT.muon )
MenuItem('L1_MU14FCH_FIRSTEMPTY' ).setLogic(d.MU14FCH & firstempty).setTriggerType(TT.muon)
MenuItem('L1_MU14FCHR_FIRSTEMPTY' ).setLogic(d.MU14FCHR & firstempty).setTriggerType(TT.muon)
- MenuItem('L1_2MU0_EMPTY' ).setLogic(d.MU0.x(2) & cosmiccond).setTriggerType( TT.muon )
MenuItem('L1_2MU3V_EMPTY' ).setLogic(d.MU3V.x(2) & cosmiccond).setTriggerType( TT.muon )
MenuItem('L1_2MU5VF_UNPAIRED_ISO' ).setLogic(d.MU5VF.x(2) & unpaired_isocond).setTriggerType( TT.muon )
MenuItem('L1_2MU5VF_UNPAIRED_NONISO').setLogic(d.MU5VF.x(2) & unpaired_nonisocond).setTriggerType( TT.muon )
@@ -1466,30 +1455,38 @@ class ItemDef:
# Phase-1:
MenuItem('L1_LAR-ZEE-eEM').setLogic( d.TOPO_ZEE_eEM20sm2 & physcond).setTriggerType( TT.lardemo ) # LAr demo (ATR-23403)
- MenuItem('L1_LATE-MU8F_XE50').setLogic( d.TOPO_LATE_MU10s1 & d.XE50 & physcond)
- MenuItem('L1_LATE-MU8F_XE40').setLogic( d.TOPO_LATE_MU10s1 & d.XE40 & physcond)
+ MenuItem('L1_LATE-MU8F_XE30').setLogic( d.TOPO_LATE_MU10s1 & d.XE30 & physcond)
MenuItem('L1_LATE-MU8F_J50' ).setLogic( d.TOPO_LATE_MU10s1 & d.J50 & physcond)
MenuItem('L1_LFV-MU8VF').setLogic( d.TOPO_0DR15_2MU6ab & d.MU8VF & d.MU5VF.x(2) & physcond)
MenuItem('L1_LFV-MU5VF' ).setLogic( d.TOPO_0DR15_2MU6ab & d.MU5VF.x(2) & physcond)
MenuItem('L1_LFV-eEM8L-MU8VF' ).setLogic( d.TOPO_0INVM10_0DR15_eEM8abl_MU10ab & d.MU8VF & physcond)
MenuItem('L1_LFV-eEM12L-MU5VF' ).setLogic( d.TOPO_0INVM10_0DR15_eEM12abl_MU6ab & physcond)
- MenuItem('L1_LFV-eEM8L').setLogic( d.TOPO_0DETA04_eEM8abl_MU10ab & d.TOPO_0DPHI03_eEM8abl_MU10ab & d.MU8F & physcond) #ATR-14282
- MenuItem('L1_LFV-eEM15L').setLogic( d.TOPO_0DETA04_eEM15abl_MUab & d.TOPO_0DPHI03_eEM15abl_MUab & physcond) #ATR-14282
+
+ #BLS
#ATR-19720
- MenuItem('L1_BPH-8M15-0DR22-2MU5VF' ).setLogic( d.TOPO_8INVM15_0DR22_2MU6ab & d.MU5VF.x(2) & physcond)
- MenuItem('L1_BPH-8M15-0DR22-MU5VFMU3V-BO').setLogic( d.TOPO_8INVM15_0DR22_MU6ab_MU4ab & d.TOPO_MULT_CMU4ab.x(2) & d.TOPO_MULT_CMU6ab & d.MU5VF & physcond)
- MenuItem('L1_BPH-2M9-2DR15-2MU5VF' ).setLogic( d.TOPO_2INVM9_2DR15_2MU6ab & d.MU5VF.x(2) & physcond)
- MenuItem('L1_BPH-2M9-0DR15-MU5VFMU3V' ).setLogic( d.TOPO_2INVM9_0DR15_MU6ab_MU4ab & d.MU5VF & physcond)
- MenuItem('L1_BPH-2M9-0DR15-2MU3V' ).setLogic( d.TOPO_2INVM9_0DR15_2MU4ab & physcond)
+ MenuItem('L1_BPH-2M9-0DR15-2MU3V' ).setLogic( d.TOPO_2INVM9_0DR15_2MU4ab & physcond)
+ MenuItem('L1_BPH-2M9-0DR15-MU5VFMU3V' ).setLogic( d.TOPO_2INVM9_0DR15_MU6ab_MU4ab & d.MU5VF & physcond)
+ MenuItem('L1_BPH-2M9-2DR15-2MU5VF' ).setLogic( d.TOPO_2INVM9_2DR15_2MU6ab & d.MU5VF.x(2) & physcond)
+ MenuItem('L1_BPH-8M15-0DR22-MU5VFMU3V-BO' ).setLogic( d.TOPO_8INVM15_0DR22_MU6ab_MU4ab & d.TOPO_MULT_CMU4ab.x(2) & d.TOPO_MULT_CMU6ab & d.MU5VF & physcond)
+ MenuItem('L1_BPH-8M15-0DR22-2MU5VF' ).setLogic( d.TOPO_8INVM15_0DR22_2MU6ab & d.MU5VF.x(2) & physcond)
+ #ATR-19355
+ MenuItem('L1_BPH-0M10-3MU3V' ).setLogic( d.TOPO_0INVM10_3MU4ab & physcond)
+ #ATR-19638
+ MenuItem('L1_BPH-0M10C-3MU3V' ).setLogic( d.TOPO_0INVM10C_3MU4ab & physcond)
+ #ATR-19639
+ MenuItem('L1_BPH-2M9-0DR15-C-MU5VFMU3V' ).setLogic( d.TOPO_2INVM9_0DR15_C_MU6ab_MU4ab & d.MU5VF & physcond)
+ # ATR-21566
+ MenuItem('L1_BPH-0DR12C-2MU3V').setLogic( d.TOPO_0DR12C_2MU4ab & physcond)
+ # Barrel only, maybe needed?
MenuItem("L1_2MU3V-BO" ).setLogic( d.TOPO_MULT_CMU4ab.x(2) & physcond)
MenuItem("L1_2MU5VF-BO" ).setLogic( d.TOPO_MULT_CMU6ab.x(2) & d.MU5VF.x(2) & physcond)
MenuItem("L1_MU5VFMU3V-BO").setLogic( d.TOPO_MULT_CMU4ab.x(2) & d.TOPO_MULT_CMU6ab & d.MU5VF & physcond)
- #ATR-19355
- MenuItem('L1_BPH-0M10-3MU3V' ).setLogic( d.TOPO_0INVM10_3MU4ab & physcond)
- # ATR-19510
+
+ # ATR-19510, SM Low-mass DY
MenuItem('L1_DY-BOX-2MU3V' ).setLogic( d.TOPO_5DETA99_5DPHI99_2MU4ab & d.MU3V.x(2) & physcond)
MenuItem('L1_DY-BOX-MU5VFMU3V').setLogic( d.TOPO_5DETA99_5DPHI99_MU6ab_MU4ab & d.MU5VF & physcond)
MenuItem('L1_DY-BOX-2MU5VF').setLogic( d.TOPO_5DETA99_5DPHI99_2MU6ab & d.MU5VF.x(2) & physcond)
+
#ATR-17320
MenuItem('L1_CEP-CjJ60').setLogic( d.TOPO_CEP_CjJ60s6 & physcond )
MenuItem('L1_CEP-CjJ50').setLogic( d.TOPO_CEP_CjJ50s6 & physcond )
@@ -1508,7 +1505,6 @@ class ItemDef:
# subset of legacy chains migrated phase1 boards
MenuItem('L1_BPH-0M9-eEM7-eEM5').setLogic( d.TOPO_0INVM9_eEM7ab_eEMab & physcond)
-
MenuItem('L1_BPH-0M9-eEM7-eEM5_MU5VF').setLogic( d.MU5VF & d.TOPO_0INVM9_eEM7ab_eEMab & physcond)
MenuItem('L1_BPH-0M9-eEM7-eEM5_2MU3V').setLogic( d.MU3V.x(2) & d.TOPO_0INVM9_eEM7ab_eEMab & physcond)
MenuItem('L1_BPH-0DR3-eEM7jJ15').setLogic( d.TOPO_0DR03_eEM7ab_CjJ15ab & physcond)
@@ -1547,35 +1543,9 @@ class ItemDef:
MenuItem('L1_DPHI-2eEM3_VTE5p24ETA49_ALFA_EINE').setLogic( d.TOPO_27DPHI32_eEMs1_eEMs6 & Not(d.TE524ETA49) & ALFA_EINE & physcond).setTriggerType(TT.alfa)
MenuItem('L1_DPHI-2eEM3_VTE10').setLogic( d.TOPO_27DPHI32_eEMs1_eEMs6 & Not(d.TE10) & physcond).setTriggerType(TT.calo)
MenuItem('L1_DPHI-2eEM8_VTE50').setLogic( d.eEM8.x(2) & d.TOPO_27DPHI32_eEMs1_eEMs6 & Not(d.TE50) & physcond).setTriggerType(TT.calo)
-
- #needed?
MenuItem('L1_BTAG-MU3VjJ15').setLogic( d.TOPO_0DR04_MU4ab_CjJ15ab & physcond)
MenuItem('L1_BTAG-MU5VFjJ20').setLogic( d.TOPO_0DR04_MU6ab_CjJ20ab & d.MU5VF & physcond)
- #needed?
- MenuItem('L1_BPH-2M8-2MU3V_BPH-0DR15-2MU3V' ).setLogic( d.TOPO_2INVM8_2MU4ab & d.TOPO_0DR15_2MU4ab & physcond) # 78% for Bs,J/psi
- MenuItem('L1_BPH-2M9-2MU3V_BPH-0DR15-2MU3V' ).setLogic( d.TOPO_2INVM9_2MU4ab & d.TOPO_0DR15_2MU4ab & physcond) # 78% for Bs,J/psi
- MenuItem('L1_BPH-7M15-2MU3V_BPH-0DR24-2MU3V' ).setLogic( d.TOPO_7INVM15_2MU4ab & d.TOPO_0DR24_2MU4ab & physcond) # 78% for Upsi
- MenuItem('L1_BPH-2M8-MU5VFMU3V_BPH-0DR15-MU5VFMU3V' ).setLogic( d.TOPO_2INVM8_MU6ab_MU4ab & d.TOPO_0DR15_MU6ab_MU4ab & d.MU5VF & physcond) # 86% for Bs,J/psi
- MenuItem('L1_BPH-2M9-MU5VFMU3V_BPH-0DR15-MU5VFMU3V' ).setLogic( d.TOPO_2INVM9_MU6ab_MU4ab & d.TOPO_0DR15_MU6ab_MU4ab & d.MU5VF & physcond)
- MenuItem('L1_BPH-8M15-MU5VFMU3V_BPH-0DR22-MU5VFMU3V').setLogic( d.TOPO_8INVM15_MU6ab_MU4ab & d.TOPO_0DR22_MU6ab_MU4ab & d.MU5VF & physcond) # 86% for Upsi
- MenuItem('L1_BPH-2M9-2MU5VF_BPH-2DR15-2MU5VF' ).setLogic( d.TOPO_2INVM9_2MU6ab & d.TOPO_2DR15_2MU6ab & d.MU5VF.x(2) & physcond) # 96% for Bs,J/psi
- MenuItem('L1_BPH-2M9-2MU5VF' ).setLogic( d.TOPO_2INVM9_2MU6ab & d.MU5VF.x(2) & physcond)
- MenuItem('L1_BPH-8M15-2MU5VF_BPH-0DR22-2MU5VF' ).setLogic( d.TOPO_8INVM15_2MU6ab & d.TOPO_0DR22_2MU6ab & d.MU5VF.x(2) & physcond) # 96% for Upsi
MenuItem('L1_BPH-8M15-2MU3V-BO' ).setLogic( d.TOPO_8INVM15_2CMU4ab & physcond) # 96% for Upsi
- # Barrel and BarrelOnly items w/o topo selection
- MenuItem('L1_2MU3V-B' ).setLogic( d.MU3V.x(2) & d.TOPO_MULT_CMU4ab & physcond) # 2MU4_Barrel
- MenuItem('L1_2MU5VF-B' ).setLogic( d.MU5VF.x(2) & d.TOPO_MULT_CMU6ab & physcond) # 2MU6_Barrel
- MenuItem('L1_MU5VF_2MU3V-B').setLogic( d.MU5VF & d.MU3V.x(2) & d.TOPO_MULT_CMU4ab & physcond) # MU6_2MU4_Barrel,
- # Barrel and BarrelOnly variants of L1Topo items
- MenuItem('L1_BPH-2M8-2MU3V-B_BPH-0DR15-2MU3V' ).setLogic( d.TOPO_2INVM8_CMU4ab_MU4ab & d.TOPO_0DR15_2MU4ab & physcond) # 78% for Bs,J/psi + OneBarrel
- MenuItem('L1_BPH-7M15-2MU3V_BPH-0DR24-2MU3V-B' ).setLogic( d.TOPO_7INVM15_2MU4ab & d.TOPO_0DR24_2MU4ab & d.TOPO_MULT_CMU4ab & physcond) # 78% for Upsi + OneBarrel
- MenuItem('L1_BPH-7M15-2MU3V_BPH-0DR24-2MU3V-BO' ).setLogic( d.TOPO_7INVM15_2MU4ab & d.TOPO_0DR24_2CMU4ab & physcond) # 78% for Upsi + BarrelOnly
- MenuItem('L1_BPH-2M8-MU5VFMU3V-B_BPH-0DR15-MU5VFMU3V' ).setLogic( d.TOPO_2INVM8_ONEBARREL_MU6ab_MU4ab & d.TOPO_0DR15_MU6ab_MU4ab & d.MU5VF & physcond) # 86% for Bs,J/psi + OneBarrel
- MenuItem('L1_BPH-8M15-MU5VFMU3V_BPH-0DR22-MU5VFMU3V-B').setLogic( d.TOPO_8INVM15_MU6ab_MU4ab & d.TOPO_0DR22_MU6ab_MU4ab & d.TOPO_MULT_CMU4ab & d.MU5VF & physcond)
- MenuItem('L1_BPH-8M15-MU5VFMU3V_BPH-0DR22-MU5VFMU3V-BO').setLogic( d.TOPO_8INVM15_MU6ab_MU4ab & d.TOPO_0DR22_MU6ab_MU4ab & d.TOPO_MULT_CMU4ab.x(2) & d.TOPO_MULT_CMU6ab & d.MU5VF & physcond)
- MenuItem('L1_BPH-2M8-2MU3V').setLogic( d.TOPO_2INVM8_2MU4ab & physcond) # backup 71% for Bs,J/psi
- MenuItem('L1_BPH-8M15-MU5VFMU3V').setLogic( d.TOPO_8INVM15_MU6ab_MU4ab & d.MU5VF & physcond) # backup 71% for Upsi
- MenuItem('L1_BPH-8M15-2MU5VF').setLogic( d.TOPO_8INVM15_2MU6ab & d.MU5VF.x(2) & physcond) # backup 95% for Upsi
except NameError as ex:
exc_type, exc_value, exc_traceback = sys.exc_info()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
index a12a6ff9238c94fc7687bda17d35a7f6993762bf..2c65c12ff7db4c39038b3058616eeb347fde2aa4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
@@ -67,11 +67,6 @@ class ThresholdDef:
MuonThreshold( "MU8EOF" ).setThrValue( thr=8 ).setTGCFlags("F").setRegion("EC,FW") # forward muon, commissioning
MuonThreshold( "MU3EOF" ).setThrValue( thr=3, ba=4 ).setTGCFlags("F").setRegion("EC,FW") # forward muon, commissioning
- # special threshold for magnet-off menu
- MuonThreshold( "MU0").setThrValue( thr=0 )
-
-
-
# EM
for thrV in [3, 5, 8, 15, 20, 22]:
#EMThreshold('eEM%i' % thrV, 'eEM').addThrValue(thrV)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
index 07ef9637c9f5e01c0d019e7930e03b497ea28169..c96281b8b6b8975e5c6d94187886aa9f553b9a70 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
@@ -326,6 +326,38 @@ class TopoAlgoDef:
alg.addvariable('DeltaRMax', d.maxDr*d.maxDr*_dr_conversion*_dr_conversion)
tm.registerTopoAlgo(alg)
+ # dimu DR with opposite charge, ATR-23073, ATR-21566
+ # TODO: udpate with phase1 muons
+ listofalgos=[
+ {"minDr": 0, "maxDr": 12, "mult": 2, "otype1" : "MU", "ocut1": 4, "olist" : "ab", "otype2" : "", "ocut2": 4, "onebarrel": 0}, #0DR12C-2MU4ab
+ ]
+ for x in listofalgos:
+ class d:
+ pass
+ for k in x:
+ setattr (d, k, x[k])
+ obj1 = "%s%s%s%s" % ((str(d.mult) if d.mult>1 else ""), d.otype1, str(d.ocut1), d.olist)
+ obj2 = "-%s%s%s" % (d.otype2, str(d.ocut2), d.olist)
+ toponame = "%iDR%iC-%s%s%s" % (d.minDr, d.maxDr, "ONEBARREL-" if d.onebarrel==1 else "", obj1, "" if d.mult>1 else obj2)
+ log.debug("Define %s", toponame)
+ inputList = [d.otype1 + d.olist] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist, d.otype2 + d.olist]
+ algoname = AlgConf.DeltaRSqrIncl1Charge if (d.mult>1 or d.otype1==d.otype2) else AlgConf.DeltaRSqrIncl2
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ])
+ if (d.mult>1 or d.otype1==d.otype2):
+ alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
+ alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
+ alg.addgeneric('RequireOneBarrel', d.onebarrel)
+ else:
+ alg.addgeneric('InputWidth1', HW.OutputWidthSelectMU)
+ alg.addgeneric('InputWidth2', HW.OutputWidthSelectMU)
+ alg.addgeneric('MaxTob1', HW.OutputWidthSelectMU)
+ alg.addgeneric('MaxTob2', HW.OutputWidthSelectMU)
+ alg.addgeneric('NumResultBits', 1)
+ alg.addvariable('MinET1', d.ocut1*_et_conversion)
+ alg.addvariable('MinET2', d.ocut2*_et_conversion)
+ alg.addvariable('DeltaRMin', d.minDr*d.minDr*_dr_conversion*_dr_conversion)
+ alg.addvariable('DeltaRMax', d.maxDr*d.maxDr*_dr_conversion*_dr_conversion)
+ tm.registerTopoAlgo(alg)
# deta-dphi with ab+ab
# TODO: udpate with phase1 muons
@@ -1142,6 +1174,19 @@ class TopoAlgoDef:
alg.addvariable('MinET1', 4*_et_conversion)
tm.registerTopoAlgo(alg)
+ #ATR-19638, 3muon, not all with the same charge
+ # TODO: to be updated with phase1 muons
+ toponame = "0INVM10C-3MU4ab"
+ log.debug("Define %s", toponame)
+ inputList = 'MUab'
+ alg = AlgConf.InvariantMassThreeTOBsIncl1Charge( name = toponame, inputs = inputList, outputs = toponame )
+ alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
+ alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
+ alg.addgeneric('NumResultBits', 1)
+ alg.addvariable('MinMSqr', 0*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 10*10*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 4*_et_conversion)
+ tm.registerTopoAlgo(alg)
#ATR-18815
# TODO: to be updated with phase1 muons
@@ -1352,6 +1397,23 @@ class TopoAlgoDef:
alg.addvariable('DeltaRMax', 15*15*_dr_conversion*_dr_conversion)
tm.registerTopoAlgo(alg)
+ #ATR-19639, L1_BPH-2M9-0DR15-C-MU6MU4, with opposite charge
+ # TODO: update with phase1 muons
+ toponame = "2INVM9-0DR15-C-MU6ab-MU4ab"
+ log.debug("Define %s", toponame)
+ inputList = ['MUab']
+ alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl1Charge( name = toponame, inputs = inputList, outputs = toponame )
+ alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
+ alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
+ alg.addgeneric('NumResultBits', 1)
+ alg.addvariable('MinMSqr', 2*2*_et_conversion*_et_conversion)
+ alg.addvariable('MaxMSqr', 9*9*_et_conversion*_et_conversion)
+ alg.addvariable('MinET1', 6*_et_conversion)
+ alg.addvariable('MinET2', 4*_et_conversion)
+ alg.addvariable('DeltaRMin', 0*_dr_conversion*_dr_conversion)
+ alg.addvariable('DeltaRMax', 15*15*_dr_conversion*_dr_conversion)
+ tm.registerTopoAlgo(alg)
+
#ATR-19720, L1_BPH-8M15-0DR22-MU6MU4-BO
# TODO: update with phase1 muons
toponame = "8INVM15-0DR22-MU6ab-MU4ab"
@@ -1385,7 +1447,10 @@ class TopoAlgoDef:
alg.addvariable('DeltaRMin', 0*_dr_conversion*_dr_conversion)
alg.addvariable('DeltaRMax', 15*15*_dr_conversion*_dr_conversion)
tm.registerTopoAlgo(alg)
-
+
+
+
+
# CEP_CjJ
# TODO: update with phase1 jets, what conversion for Xi?
CEPmap = [
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_HI_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_HI_v1.py
index da96e8f871ff0eb6ec194453a5d1edb077f73fc8..ff561d4505839d0826e6fb25548748fdd9effdfa 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_HI_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_HI_v1.py
@@ -183,227 +183,12 @@ def defineMenu():
]
-#CTP IDs are taken from this mapping. Every L1 item needs a unique ctpid.
+
# Run this file as python python/l1menu/Menu_MC_pp_v7.py to print out available IDs
-# 463-464 are reserved for L1_RD2_BGRP14 and L1_RD3_BGRP15 (in MC_Physics_pp_v7)
-# 509-511 are reserved for CALREQ
+# CTP IDs 509-511 are reserved for CALREQ
L1MenuFlags.CtpIdMap = {
- 'L1_EM3' : 0,
- 'L1_EM7' : 1,
- 'L1_EM12' : 2,
- 'L1_EM8VH' : 3,
- 'L1_EM10VH' : 4,
- 'L1_EM15' : 6,
- 'L1_EM15VH' : 7,
- 'L1_EM18VHI' : 8,
- 'L1_EM20VH' : 9,
- 'L1_EM20VHI' : 10,
- 'L1_EM22VHI' : 11,
- 'L1_EM3_EMPTY' : 12,
- 'L1_EM7_EMPTY' : 13,
- 'L1_2EM3' : 23,
- 'L1_2EM7' : 24,
- #'L1_EM30VHI' : 25,
- 'L1_2EM15' : 27,
- 'L1_2EM15VH' : 28,
- 'L1_EM15VHI' : 29,
- #'L1_EM24VHIM' : 30,
- 'L1_2EM15VHI' : 31,
- 'L1_2EM20VH':400,
- 'L1_EM20VH_3EM10VH':431,
- 'L1_4J15p0ETA25' : 41,
-
- 'L1_J15' : 92,
- 'L1_J20' : 93,
- 'L1_J25' : 94,
- 'L1_J30' : 95,
- 'L1_J40' : 96,
- 'L1_J50' : 97,
- 'L1_J75' : 98,
- 'L1_J85' : 99,
- 'L1_J100' : 100,
- 'L1_J120' : 101,
- 'L1_J400' : 102,
- 'L1_J20p31ETA49' : 103,
- 'L1_J30p31ETA49' : 104,
- 'L1_J50p31ETA49' : 105,
- 'L1_J75p31ETA49' : 106,
- 'L1_J15p31ETA49' : 109,
-
- 'L1_J12_EMPTY' : 111,
- 'L1_J12_FIRSTEMPTY' : 112,
- 'L1_J12_UNPAIRED_ISO' : 113,
- 'L1_J12_UNPAIRED_NONISO' : 114,
- 'L1_J12_ABORTGAPNOTCALIB' : 115,
- 'L1_J15p31ETA49_UNPAIRED_ISO' : 75,
- 'L1_J30_EMPTY' : 116,
- 'L1_J30_FIRSTEMPTY' : 117,
- 'L1_J30p31ETA49_EMPTY' : 118,
- 'L1_J30p31ETA49_UNPAIRED_ISO' : 119,
- 'L1_J30p31ETA49_UNPAIRED_NONISO' : 120,
- 'L1_J50_UNPAIRED_ISO' : 121,
- 'L1_J50_UNPAIRED_NONISO' : 122,
- 'L1_J50_ABORTGAPNOTCALIB' : 123,
-
- 'L1_3J40' : 128,
- 'L1_3J50' : 130,
- 'L1_4J15' : 131,
- 'L1_4J20' : 132,
- 'L1_3J15p0ETA25_XE40' : 184,
- 'L1_J45p0ETA21_3J15p0ETA25' : 86,
- 'L1_J50_2J40p0ETA25_3J15p0ETA25' : 87,
-
- 'L1_6J15' : 135,
- 'L1_J85_3J30' : 480,
- #'L1_J30p0ETA49_2J20p0ETA49' : 137,
-
- 'L1_5J15p0ETA25' : 140,
- 'L1_2J15_XE55' : 141,
- 'L1_J40_XE50' : 142,
-
- #'L1_XE10': 68,
- 'L1_XE30': 85,
- 'L1_XE300': 187,
-
- 'L1_XE35' : 144,
- 'L1_XE40' : 145,
- 'L1_XE45' : 146,
- 'L1_XE50' : 147,
- 'L1_XE55' : 148,
- 'L1_XE60' : 149,
- #'L1_XE70' : 150,
- #'L1_XE80' : 151,
- #'L1_EM12_XS20' : 154,
- #'L1_EM15_XS30' : 155,
- 'L1_TE10' : 158,
- 'L1_TE30' : 138,
-
- 'L1_BCM_Wide_UNPAIRED_NONISO' : 161,
- 'L1_CEP-CJ60' : 162,
- 'L1_BCM_AC_UNPAIRED_ISO' : 163,
- 'L1_CEP-CJ50' : 80,
- 'L1_MBTS_1_EMPTY' : 164,
- 'L1_MBTS_1_1_EMPTY' : 168,
- 'L1_MBTS_2_EMPTY' : 166,
- 'L1_EM20VH_3J20' : 26,
- 'L1_EM18VHI_3J20' : 172,
- 'L1_2J50_XE40' : 175,
- 'L1_J40_XE60' : 176,
- 'L1_J25p0ETA23_2J15p31ETA49': 335 ,
- 'L1_J40p0ETA25_2J15p31ETA49' : 181,
- 'L1_J40p0ETA25_2J25_J20p31ETA49' : 182,
-
- ## noid
- 'L1_RD0_FILLED' : 200,
- 'L1_RD0_UNPAIRED_ISO' : 201,
- 'L1_RD0_EMPTY' : 202,
- 'L1_RD0_FIRSTEMPTY' : 209,
- 'L1_RD1_EMPTY' : 204,
- 'L1_RD2_FILLED' : 205,
- 'L1_RD2_EMPTY' : 206,
- 'L1_RD3_FILLED' : 207,
- 'L1_RD3_EMPTY' : 208,
- 'L1_TGC_BURST' : 220,
- 'L1_BCM_AC_CA_BGRP0' : 223,
- 'L1_BCM_Wide_EMPTY' : 224,
- 'L1_BCM_Wide_UNPAIRED_ISO' : 225,
-
- 'L1_BCM_CA_UNPAIRED_ISO' : 229,
- 'L1_BCM_AC_UNPAIRED_NONISO' : 230,
- 'L1_BCM_CA_UNPAIRED_NONISO' : 231,
- 'L1_BCM_AC_ABORTGAPNOTCALIB' : 232,
- 'L1_BCM_CA_ABORTGAPNOTCALIB' : 233,
- 'L1_BCM_Wide_ABORTGAPNOTCALIB' : 234,
- 'L1_BCM_AC_CALIB' : 235,
- 'L1_BCM_CA_CALIB' : 236,
- 'L1_BCM_Wide_CALIB' : 237,
-
- 'L1_ZB' : 240,
-
- 'L1_HT190-J15pETA21' : 258,
- 'L1_HT190-J15s5pETA21' : 259,
- 'L1_HT150-J20pETA31' : 260,
- 'L1_JPSI-1M5-EM7' : 263,
- 'L1_JPSI-1M5-EM12' : 264,
- 'L1_MJJ-400-0DPHI20' : 270,
- 'L1_MJJ-400-0DPHI22' : 272,
- 'L1_MJJ-400-0DPHI24' : 274,
- 'L1_MJJ-400-0DPHI26' : 276,
- 'L1_EM22VH' : 295,
-
- ### ATR-14350 - these should be replaced in 2017 with items 296 and 298
- 'L1_LFV-EM8I' : 320,
- 'L1_LFV-EM15I' : 321,
- 'L1_MJJ-800' : 327,
- 'L1_MJJ-400' : 329,
- 'L1_MJJ-100' : 333,
- 'L1_J50_DETA20-J50J' : 275,
- 'L1_DPHI-2EM3' : 288,
- 'L1_HT150-JJ15pETA49' : 334,
- 'L1_J4-MATCH' : 336,
- 'L1_LLP-RO' : 338,
- 'L1_LLP-NOMATCH' : 339,
-
- 'L1_LAR-EM' : 351,
- 'L1_LAR-J' : 352,
- 'L1_LAR-ZEE' : 71,
- 'L1_LAR-ZEE_LAR-EM' : 285,
- 'L1_SC111-CJ15' : 356,
- 'L1_SC85-CJ15' : 357,
-
- 'L1_EM7_FIRSTEMPTY': 371,
- 'L1_RD0_ABORTGAPNOTCALIB':372,
- 'L1_3J25p0ETA23' : 373,
- 'L1_3J35p0ETA23' : 425,
- #'L1_4J20p0ETA49' : 383,
- 'L1_HT150-JJ15pETA49_MJJ-400' : 416,
-
- ### ATR-15062
-
- 'L1_EM7_UNPAIRED_ISO': 389,
- 'L1_EM24VHI' : 392,
- #
- 'L1_EM20VH_FIRSTEMPTY': 411,
- 'L1_J100_FIRSTEMPTY': 414,
-
- # LUCID
- 'L1_LUCID' : 212,
- 'L1_LUCID_EMPTY' : 213,
- 'L1_LUCID_UNPAIRED_ISO' : 214,
- 'L1_LUCID_BGRP9' : 471,
- 'L1_LUCID_BGRP11' : 472,
-
- # TRT
- 'L1_TRT_FILLED' : 218,
- 'L1_TRT_EMPTY' : 219,
-
- # ALFA
- 'L1_ALFA_A7L1L': 492,
- 'L1_ALFA_A7L1U': 491,
- 'L1_ALFA_A7R1L': 494,
- 'L1_ALFA_A7R1U': 493,
- 'L1_ALFA_ANY' : 490,
- 'L1_ALFA_B7L1L': 497,
- 'L1_ALFA_B7L1U': 489,
- 'L1_ALFA_B7R1L': 496,
- 'L1_ALFA_B7R1U': 495,
-
-
- # RNDM
- 'L1_RD0_UNPAIRED_NONISO' : 178,
- 'L1_RD0_BGRP9' : 210,
- 'L1_RD0_BGRP10' : 473,
- 'L1_RD0_BGRP11' : 211,
- 'L1_RD1_FILLED' : 203,
- 'L1_RD1_BGRP10' : 188,
- 'L1_RD2_EMPTY' : 206,
- 'L1_RD2_BGRP12' : 390,
- 'L1_RD3_FILLED' : 207,
- 'L1_RD3_EMPTY' : 208,
- 'L1_RD2_BGRP14' : 463,
- 'L1_RD3_BGRP15' : 464,
# NB: 508 is reserved for the zero bias trigger, and 509-511 for the CALREQ triggers (at the moment, ATR-22654)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py
index 92cac5933a42d10d9b18b08e7ef1f5888f09519f..7282b2e218f4c307378fdc4e4dbc8f70753bf56f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py
@@ -286,11 +286,16 @@ def defineMenu():
'L1_LLP-RO-eEM', 'L1_LLP-NOMATCH-eEM',
'L1_DPHI-2eEM3',
'L1_jHT150-jJ20s5pETA31_jMJJ-400-CF',
- 'L1_DY-BOX-2MU5VF',
+
+ #ATR-19510
+ 'L1_DY-BOX-2MU5VF', 'L1_DY-BOX-MU5VFMU3V', 'L1_DY-BOX-2MU3V',
+
+ #ATR-23394
'L1_LFV-eEM8L-MU8VF', 'L1_LFV-eEM12L-MU5VF',
+
'L1_LFV-MU5VF',
- 'L1_LFV-MU8VF',
- 'L1_LFV-eEM8L', 'L1_LFV-eEM15L',
+ 'L1_LFV-MU8VF',
+
'L1_jMJJ-700-NFF',
'L1_jMJJ-300-NFF',
'L1_jMJJ-500-NFF',
@@ -299,23 +304,26 @@ def defineMenu():
'L1_10DR-MU14FCH-MU5VF', #ATR-19376
- #ATR-19720
+ #ATR-19720, ATR-19639
'L1_BPH-2M9-0DR15-2MU3V',
- 'L1_BPH-8M15-2MU3V-BO',
'L1_BPH-2M9-0DR15-MU5VFMU3V',
- 'L1_BPH-8M15-0DR22-MU5VFMU3V-BO',
+ 'L1_BPH-2M9-0DR15-C-MU5VFMU3V',
'L1_BPH-2M9-2DR15-2MU5VF',
+ 'L1_BPH-8M15-0DR22-MU5VFMU3V-BO',
'L1_BPH-8M15-0DR22-2MU5VF',
-
+ #ATR-19355
+ 'L1_BPH-0M10-3MU3V',
+ #ATR-19638
+ 'L1_BPH-0M10C-3MU3V',
+ #ATR-21566
+ 'L1_BPH-0DR12C-2MU3V',
+
# INVM + DPHI
'L1_jMJJ-400-NFF-0DPHI22',
'L1_jMJJ-400-NFF-0DPHI24',
'L1_jMJJ-400-NFF-0DPHI26',
- 'L1_LATE-MU8F_XE50','L1_LATE-MU8F_XE40', 'L1_LATE-MU8F_J50',
-
- #ATR-19355
- 'L1_BPH-0M10-3MU3V',
+ 'L1_LATE-MU8F_XE30', 'L1_LATE-MU8F_J50',
#ATR-18824
'L1_ZAFB-04DPHI-eEM15M',
@@ -325,9 +333,6 @@ def defineMenu():
'L1_DPHI-M70-2eEM10M', 'L1_DPHI-M70-2eEM12M', #ATR-19302
'L1_DPHI-M70-2eEM12', # ATR-21637 (no shower shape cuts)
-
- #ATR-19510
- 'L1_DY-BOX-2MU3V',
#ATR-17320
'L1_CEP-CjJ60',
@@ -337,256 +342,11 @@ def defineMenu():
]
-#CTP IDs are taken from this mapping. Every L1 item needs a unique ctpid.
# Run this file as python python/l1menu/Menu_MC_pp_v7.py to print out available IDs
-# 463-464 are reserved for L1_RD2_BGRP14 and L1_RD3_BGRP15 (in MC_Physics_pp_v7)
-# 509-511 are reserved for CALREQ
+# CTP ID 509-511 are reserved for CALREQ
L1MenuFlags.CtpIdMap = {
- 'L1_RD0_FILLED' : 200,
- 'L1_RD0_UNPAIRED_ISO' : 201,
- 'L1_RD0_EMPTY' : 202,
- 'L1_RD0_FIRSTEMPTY' : 209,
- 'L1_RD0_ABORTGAPNOTCALIB':372,
- 'L1_RD0_UNPAIRED_NONISO' : 178,
- 'L1_RD0_BGRP9' : 210,
- 'L1_RD0_BGRP10' : 473,
- 'L1_RD0_BGRP11' : 211,
- 'L1_RD1_EMPTY' : 204,
- 'L1_RD1_FILLED' : 203,
- 'L1_RD1_BGRP10' : 188,
- 'L1_RD2_FILLED' : 205,
- 'L1_RD2_EMPTY' : 206,
- 'L1_RD2_BGRP12' : 390,
- 'L1_RD2_BGRP14' : 463,
- 'L1_RD3_FILLED' : 207,
- 'L1_RD3_EMPTY' : 208,
- 'L1_RD3_BGRP15' : 464,
-
- 'L1_TGC_BURST' : 220,
- 'L1_ZB' : 240,
-
- 'L1_LUCID' : 212,
- 'L1_LUCID_EMPTY' : 213,
- 'L1_LUCID_UNPAIRED_ISO' : 214,
- 'L1_LUCID_BGRP9' : 471,
- 'L1_LUCID_BGRP11' : 472,
-
- 'L1_TRT_FILLED' : 218,
- 'L1_TRT_EMPTY' : 219,
-
- 'L1_BCM_AC_CA_BGRP0' : 223,
- 'L1_BCM_AC_UNPAIRED_ISO' : 163,
- 'L1_BCM_CA_UNPAIRED_ISO' : 229,
- 'L1_BCM_AC_UNPAIRED_NONISO' : 230,
- 'L1_BCM_CA_UNPAIRED_NONISO' : 231,
- 'L1_BCM_AC_ABORTGAPNOTCALIB' : 232,
- 'L1_BCM_CA_ABORTGAPNOTCALIB' : 233,
- 'L1_BCM_AC_CALIB' : 235,
- 'L1_BCM_CA_CALIB' : 236,
- 'L1_BCM_Wide_ABORTGAPNOTCALIB' : 234,
- 'L1_BCM_Wide_CALIB' : 237,
- 'L1_BCM_Wide_UNPAIRED_NONISO' : 161,
- 'L1_BCM_Wide_EMPTY' : 224,
- 'L1_BCM_Wide_UNPAIRED_ISO' : 225,
-
- 'L1_MBTS_1_EMPTY' : 164,
- 'L1_MBTS_1_1_EMPTY' : 168,
- 'L1_MBTS_2_EMPTY' : 166,
- 'L1_MBTS_1_UNPAIRED_ISO' : 169,
- 'L1_MBTS_2_UNPAIRED_ISO' : 170,
- 'L1_MBTS_1_1_UNPAIRED_ISO' : 171,
-
- 'L1_MBTSA0' : 401,
- 'L1_MBTSA1' : 402,
- 'L1_MBTSA2' : 403,
- 'L1_MBTSA3' : 404,
- 'L1_MBTSA4' : 405,
- 'L1_MBTSA5' : 406,
- 'L1_MBTSA6' : 407,
- 'L1_MBTSA7' : 408,
- 'L1_MBTSA8' : 409,
- 'L1_MBTSA9' : 410,
- 'L1_MBTSA10' : 443,
- 'L1_MBTSA11' : 412,
- 'L1_MBTSA12' : 413,
- 'L1_MBTSA13' : 415,
- 'L1_MBTSA14' : 416,
- 'L1_MBTSA15' : 444,
- 'L1_MBTSC0' : 418,
- 'L1_MBTSC1' : 419,
- 'L1_MBTSC2' : 420,
- 'L1_MBTSC3' : 421,
- 'L1_MBTSC4' : 422,
- 'L1_MBTSC5' : 423,
- 'L1_MBTSC6' : 424,
- 'L1_MBTSC7' : 434,
- 'L1_MBTSC8' : 435,
- 'L1_MBTSC9' : 436,
- 'L1_MBTSC10' : 437,
- 'L1_MBTSC11' : 438,
- 'L1_MBTSC12' : 439,
- 'L1_MBTSC13' : 440,
- 'L1_MBTSC14' : 441,
- 'L1_MBTSC15' : 442,
-
- 'L1_ALFA_A7L1L': 492,
- 'L1_ALFA_A7L1U': 491,
- 'L1_ALFA_A7R1L': 494,
- 'L1_ALFA_A7R1U': 493,
- 'L1_ALFA_ANY' : 490,
- 'L1_ALFA_B7L1L': 497,
- 'L1_ALFA_B7L1U': 489,
- 'L1_ALFA_B7R1L': 496,
- 'L1_ALFA_B7R1U': 495,
-
- # legacy non-physics items
- 'L1_EM3_EMPTY' : 12,
- 'L1_EM7_EMPTY' : 13,
- 'L1_EM7_FIRSTEMPTY': 371,
- 'L1_EM7_UNPAIRED_ISO': 389,
- 'L1_EM20VH_FIRSTEMPTY': 411,
- 'L1_TAU8_EMPTY' : 57,
- 'L1_TAU8_FIRSTEMPTY' : 391,
- 'L1_TAU8_UNPAIRED_ISO' : 388,
- #'L1_TAU30_EMPTY':341,
- #'L1_TAU30_UNPAIRED_ISO' : 343,
- 'L1_J12_EMPTY' : 111,
- 'L1_J12_FIRSTEMPTY' : 112,
- 'L1_J12_UNPAIRED_ISO' : 113,
- 'L1_J12_UNPAIRED_NONISO' : 114,
- 'L1_J12_ABORTGAPNOTCALIB' : 115,
- 'L1_J15p31ETA49_UNPAIRED_ISO' : 75,
- 'L1_J30_EMPTY' : 116,
- 'L1_J30_FIRSTEMPTY' : 117,
- 'L1_J30p31ETA49_EMPTY' : 118,
- 'L1_J30p31ETA49_UNPAIRED_ISO' : 119,
- 'L1_J30p31ETA49_UNPAIRED_NONISO' : 120,
- 'L1_J50_UNPAIRED_ISO' : 121,
- 'L1_J50_UNPAIRED_NONISO' : 122,
- 'L1_J50_ABORTGAPNOTCALIB' : 123,
- 'L1_J100_FIRSTEMPTY': 414,
-
- # Legacy L1Calo threholds
- # EM
- 'L1_EM3' : 0,
- 'L1_EM7' : 1,
- 'L1_EM12' : 2,
- 'L1_EM8VH' : 3,
- 'L1_EM10VH' : 4,
- 'L1_EM15VHI_2TAU12IM_4J12' : 5,
- 'L1_EM15' : 6,
- 'L1_EM15VH' : 7,
- 'L1_EM18VHI' : 8,
- 'L1_EM20VH' : 9,
- 'L1_EM20VHI' : 10,
- 'L1_EM22VHI' : 11,
- 'L1_EM22VH' : 295,
- 'L1_EM24VHI' : 392,
- 'L1_2EM3' : 23,
- 'L1_2EM7' : 24,
- #'L1_EM30VHI' : 25,
- 'L1_2EM15' : 27,
- 'L1_2EM15VH' : 28,
- 'L1_EM15VHI' : 29,
- #'L1_EM24VHIM' : 30,
- 'L1_2EM15VHI' : 31,
- 'L1_2EM20VH':400,
- 'L1_EM20VH_3EM10VH':431,
- 'L1_4J15p0ETA25' : 41,
-
- # TAU
- #'L1_TAU5' : 50,
- #'L1_2TAU5' : 59,
- 'L1_2TAU8': 459,
- #'L1_TAU12' : 45,
- 'L1_TAU12IM' : 47,
- 'L1_TAU20IM' : 51,
- 'L1_TAU100' : 52,
- #'L1_TAU30' : 53,
- 'L1_TAU40' : 54,
- 'L1_TAU60' : 55,
- #'L1_TAU90' : 56,
- 'L1_TAU20IM_2TAU12IM' : 58,
- 'L1_TAU60_2TAU40': 458,
-
- 'L1_EM15VHI_2TAU12IM' : 60,
- 'L1_EM15VHI_2TAU12IM_XE35' : 78,
- 'L1_EM15VHI_2TAU12IM_J25_3J12' : 61,
- #'L1_EM15VHI_TAU40_2TAU15' : 62,
- #'L1_EM20VHI_TAU20IM_2TAU20_J25_3J20' : 69,
-
- 'L1_TAU20IM_2TAU12IM_J25_2J20_3J12' : 70,
- 'L1_TAU20IM_2TAU12IM_4J12p0ETA25' : 316,
- 'L1_TAU20IM_2J20_XE45' : 74,
- #'L1_TAU20IM_2TAU12IM_4J12p0ETA28' : 77,
- 'L1_TAU20IM_2J20_XE50' : 79,
- 'L1_TAU25IM_2TAU20IM_2J25_3J20' : 398,
- 'L1_TAU20IM_2TAU12IM_XE35' : 83,
- 'L1_TAU40_2TAU12IM_XE40' : 429,
-
- 'L1_J15' : 92,
- 'L1_J20' : 93,
- 'L1_J25' : 94,
- 'L1_J30' : 95,
- 'L1_J40' : 96,
- 'L1_J50' : 97,
- 'L1_J75' : 98,
- 'L1_J85' : 99,
- 'L1_J100' : 100,
- #'L1_J120' : 101,
- 'L1_J400' : 102,
- 'L1_J20p31ETA49' : 103,
- 'L1_J30p31ETA49' : 104,
- 'L1_J50p31ETA49' : 105,
- 'L1_J75p31ETA49' : 106,
- 'L1_J15p31ETA49' : 109,
- 'L1_3J40' : 128,
- 'L1_3J50' : 130,
- 'L1_4J15' : 131,
- 'L1_4J20' : 132,
- 'L1_J45p0ETA21_3J15p0ETA25' : 86,
- 'L1_J50_2J40p0ETA25_3J15p0ETA25' : 87,
- 'L1_6J15' : 135,
- 'L1_J85_3J30' : 480,
- #'L1_J30p0ETA49_2J20p0ETA49' : 137,
-
- 'L1_5J15p0ETA25' : 140,
- 'L1_2J15_XE55' : 141,
- 'L1_J25p0ETA23_2J15p31ETA49': 335 ,
- 'L1_J40p0ETA25_2J15p31ETA49' : 181,
- 'L1_J40p0ETA25_2J25_J20p31ETA49' : 182,
- 'L1_3J25p0ETA23' : 373,
- 'L1_3J35p0ETA23' : 425,
- #'L1_4J20p0ETA49' : 383,
-
- #'L1_XE10': 68,
- 'L1_XE30': 85,
- 'L1_XE300': 187,
- 'L1_XE35' : 144,
- 'L1_XE40' : 145,
- 'L1_XE45' : 146,
- 'L1_XE50' : 147,
- 'L1_XE55' : 148,
- 'L1_XE60' : 149,
- #'L1_XE70' : 150,
- #'L1_XE80' : 151,
- #'L1_EM12_XS20' : 154,
- #'L1_EM15_XS30' : 155,
- 'L1_TE10' : 158,
- #'L1_TE30' : 138,
-
- 'L1_EM20VH_3J20' : 26,
- 'L1_EM18VHI_3J20' : 172,
-
- 'L1_3J15p0ETA25_XE40' : 184,
-
- 'L1_J40_XE50' : 142,
- 'L1_2J50_XE40' : 175,
- 'L1_J40_XE60' : 176,
-
-
# NB: 508 is reserved for the zero bias trigger, and 509-511 for the CALREQ triggers (at the moment, ATR-22654)
}
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
index 79de7994459378b40165ed02b6fe2a37e450cfc1..1c3df87f8fd1b65cc9d5c13e7be72970fc32253f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
@@ -153,12 +153,14 @@ def defineInputsMenu():
'400INVM-0DPHI24-jJ30s6-AjJ20s6',
'400INVM-0DPHI22-jJ30s6-AjJ20s6',
'400INVM-0DPHI20-jJ30s6-AjJ20s6'] ),
- TopoMenuDef( '0INVM10-3MU4ab', outputbits = 6 ),
+ TopoMenuDef( '0INVM10-3MU4ab', outputbits = 6 ), #BLS
TopoMenuDef( 'LATE-MU10s1', outputbits = 7 ),
- TopoMenuDef( 'MULT-CMU4ab', outputbits = (8,9), outputlines = ['MULT-CMU4ab[0]', 'MULT-CMU4ab[1]'] ), # 2bits # TODO: needed?
- TopoMenuDef( 'MULT-CMU6ab', outputbits = (10,11), outputlines = ['MULT-CMU6ab[0]', 'MULT-CMU6ab[1]'] ), # 2bits # TODO: needed?
- TopoMenuDef( '0DR04-MU4ab-CjJ15ab', outputbits = 12 ), # not a primary
- TopoMenuDef( '0DR04-MU6ab-CjJ20ab', outputbits = 13 ), # not a primary
+ TopoMenuDef( 'MULT-CMU4ab', outputbits = (8,9), outputlines = ['MULT-CMU4ab[0]', 'MULT-CMU4ab[1]'] ), # BLS, 2bits # TODO: needed?
+ TopoMenuDef( 'MULT-CMU6ab', outputbits = (10,11), outputlines = ['MULT-CMU6ab[0]', 'MULT-CMU6ab[1]'] ), # BLS, 2bits # TODO: needed?
+ TopoMenuDef( '0DR04-MU4ab-CjJ15ab', outputbits = 12 ), #Bjet, TODO: not a primary
+ TopoMenuDef( '0DR04-MU6ab-CjJ20ab', outputbits = 13 ), #Bjet, TODO: not a primary
+ TopoMenuDef( '0INVM10C-3MU4ab', outputbits = 14 ), #BLS
+ TopoMenuDef( '2INVM9-0DR15-C-MU6ab-MU4ab', outputbits = 15 ), #BLS
]
},
@@ -253,7 +255,8 @@ def defineInputsMenu():
TopoMenuDef( '0INVM70-27DPHI32-eEM10sm1-eEM10sm6', outputbits = 2 ),
TopoMenuDef( '0INVM70-27DPHI32-eEM12sm1-eEM12sm6', outputbits = 3 ),
TopoMenuDef( 'ZEE-eEM20sm2', outputbits = 4 ),
- TopoMenuDef( '10DR99-2MU6ab', outputbits = 5 ),
+ TopoMenuDef( '10DR99-2MU6ab', outputbits = 5 ), #Msonly Narrow scan triggers
+ TopoMenuDef( '0DR12C-2MU4ab', outputbits = 6 ), #BLS
]
},
@@ -261,22 +264,18 @@ def defineInputsMenu():
"fpga" : 1,
"clock" : 1,
"algorithms" : [
- TopoMenuDef( '8INVM15-0DR22-MU6ab-MU4ab', outputbits = 0 ),
- TopoMenuDef( '2INVM9-0DR15-MU6ab-MU4ab', outputbits = 1 ),
- TopoMenuDef( '2INVM9-0DR15-2MU4ab', outputbits = 2 ),
- TopoMenuDef( '2INVM9-2DR15-2MU6ab', outputbits = 3 ),
- TopoMenuDef( '5DETA99-5DPHI99-2MU4ab', outputbits = 4 ),
- TopoMenuDef( '5DETA99-5DPHI99-MU6ab-MU4ab', outputbits = 5 ),
- TopoMenuDef( '5DETA99-5DPHI99-2MU6ab', outputbits = 6 ),
- TopoMenuDef( '0DETA04-eEM8abl-MU10ab', outputbits = 7 ),
- TopoMenuDef( '0DPHI03-eEM8abl-MU10ab', outputbits = 8 ),
- TopoMenuDef( '0DETA04-eEM15abl-MUab', outputbits = 9 ),
- TopoMenuDef( '0DPHI03-eEM15abl-MUab', outputbits = 10 ),
- TopoMenuDef( '0INVM10-0DR15-eEM8abl-MU10ab', outputbits = 11 ),
- TopoMenuDef( '0INVM10-0DR15-eEM12abl-MU6ab', outputbits = 12 ),
- TopoMenuDef( '8INVM15-2CMU4ab', outputbits = 13 ), #TODO: needed?
- TopoMenuDef( '0DR15-2MU6ab', outputbits = 14 ),
- TopoMenuDef( '8INVM15-0DR22-2MU6ab', outputbits = 15 ),
+ TopoMenuDef( '8INVM15-0DR22-MU6ab-MU4ab', outputbits = 0 ), #BLS
+ TopoMenuDef( '2INVM9-0DR15-MU6ab-MU4ab', outputbits = 1 ), #BLS
+ TopoMenuDef( '2INVM9-0DR15-2MU4ab', outputbits = 2 ), #BLS
+ TopoMenuDef( '2INVM9-2DR15-2MU6ab', outputbits = 3 ), #BLS
+ TopoMenuDef( '5DETA99-5DPHI99-2MU4ab', outputbits = 4 ), #Low-mass DY
+ TopoMenuDef( '5DETA99-5DPHI99-MU6ab-MU4ab', outputbits = 5 ), #Low-mass DY
+ TopoMenuDef( '5DETA99-5DPHI99-2MU6ab', outputbits = 6 ), #Low-mass DY
+ TopoMenuDef( '0INVM10-0DR15-eEM8abl-MU10ab', outputbits = 7 ), #LFV
+ TopoMenuDef( '0INVM10-0DR15-eEM12abl-MU6ab', outputbits = 8 ), #LFV
+ TopoMenuDef( '8INVM15-2CMU4ab', outputbits = 9 ), #BLS, TODO: needed?
+ TopoMenuDef( '0DR15-2MU6ab', outputbits = 10 ), #LFV
+ TopoMenuDef( '8INVM15-0DR22-2MU6ab', outputbits = 11 ), #BLS
]
}
]