diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py
index e52a6e011d4f99e89c2fe334f7737b089a4f6403..517b8a1d4aac8bf6ab15a77b6007537994c2e961 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py
@@ -180,8 +180,8 @@ def ConfigurationComboHypo(flags, trigSequenceName = 'Dimu', **kwargs):
kwargs.setdefault("nTracks", [ 2 ])
kwargs.setdefault("trackPtThresholds", [ [ -1., -1. ] ])
kwargs.setdefault("massRange", [ (100., 20000.) ])
- kwargs.setdefault("mergedElectronChains", [ 'BPH-0DR3-EM7J15', 'HLT_e5_lhvloose_bBeeM6000' ])
- kwargs.setdefault("caloClusterEtThreshold", -1.)
+ kwargs.setdefault("mergedElectronChains", [ 'BPH-0DR3-EM7J15', 'HLT_e5_lhvloose_bBeeM6000', 'HLT_e5_lhvloose_L1eEM5_bBeeM6000', 'HLT_e5_lhvloose_L1EM3_bBeeM6000' ])
+ kwargs.setdefault("caloClusterEtThreshold", 3.)
alg = CompFactory.TrigMultiTrkComboHypo(
name = baseName+'ComboHypo',
VertexFitter = acc.popToolsAndMerge(TrigBPHY_TrkVKalVrtFitterCfg(flags, baseName)),
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 8cf082b4d0e9e50e35ed9d065e9841ed9a76e39e..43c3460c6e57a892c0c4eed5a51c881ae5f7eaaf 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -118,6 +118,40 @@ HLT_2e5_lhmedium_j70_j50a_j0_DJMASS900j50_L1jMJJ-500-NFF:
1: 2
2: 3
3: 1
+HLT_2e5_lhvloose_L1EM3_bBeeM6000_L1All:
+ eventCount: 0
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 8
+ 3: 2
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 35
+ 1: 29
+ 2: 45
+ 3: 10
+ 4: 5
+ 5: 5
+ 6: 3
+HLT_2e5_lhvloose_L1eEM5_bBeeM6000_L1All:
+ eventCount: 0
+ stepCounts:
+ 0: 7
+ 1: 7
+ 2: 7
+ 3: 2
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 21
+ 1: 16
+ 2: 29
+ 3: 9
+ 4: 5
+ 5: 5
+ 6: 3
HLT_2e5_lhvloose_bBeeM6000_L14J15:
eventCount: 0
stepCounts:
@@ -135,24 +169,41 @@ HLT_2e5_lhvloose_bBeeM6000_L14J15:
4: 5
5: 5
6: 3
-HLT_2e5_lhvloose_bBeeM6000_L1All:
+HLT_2e5_lhvloose_bBeeM6000_L14jJ40:
eventCount: 0
stepCounts:
- 0: 10
- 1: 10
- 2: 8
+ 0: 6
+ 1: 6
+ 2: 6
3: 2
4: 2
5: 2
stepFeatures:
- 0: 35
- 1: 29
- 2: 45
- 3: 10
+ 0: 18
+ 1: 14
+ 2: 25
+ 3: 8
4: 5
5: 5
6: 3
HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaled:
+ eventCount: 0
+ stepCounts:
+ 0: 7
+ 1: 7
+ 2: 7
+ 3: 2
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 21
+ 1: 16
+ 2: 29
+ 3: 9
+ 4: 5
+ 5: 5
+ 6: 3
+HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaledLegacy:
eventCount: 0
stepCounts:
0: 9
@@ -170,6 +221,23 @@ HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaled:
5: 5
6: 3
HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimary:
+ eventCount: 0
+ stepCounts:
+ 0: 7
+ 1: 7
+ 2: 7
+ 3: 2
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 21
+ 1: 16
+ 2: 29
+ 3: 9
+ 4: 5
+ 5: 5
+ 6: 3
+HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimaryLegacy:
eventCount: 0
stepCounts:
0: 10
@@ -188,6 +256,23 @@ HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimary:
6: 3
HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5_MU5VF:
eventCount: 0
+HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-eEM9-eEM7_MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 1
+ 4: 1
+ 5: 1
+ stepFeatures:
+ 0: 7
+ 1: 5
+ 2: 13
+ 3: 4
+ 4: 3
+ 5: 3
+ 6: 2
HLT_2e5_lhvloose_bBeeM6000_L1eEM26M:
eventCount: 0
stepCounts:
@@ -7169,6 +7254,74 @@ HLT_e5_lhtight_noringer_L1EM3:
4: 34
5: 34
6: 3
+HLT_e5_lhvloose_L1EM3_bBeeM6000_L1All:
+ eventCount: 0
+ stepCounts:
+ 0: 16
+ 1: 16
+ 2: 14
+ 3: 11
+ 4: 11
+ 5: 11
+ stepFeatures:
+ 0: 35
+ 1: 35
+ 2: 54
+ 3: 14
+ 4: 14
+ 5: 14
+ 6: 7
+HLT_e5_lhvloose_L1EM3_e3_lhvloose_L1EM3_bBeeM6000_L1All:
+ eventCount: 0
+ stepCounts:
+ 0: 11
+ 1: 11
+ 2: 9
+ 3: 4
+ 4: 4
+ 5: 4
+ stepFeatures:
+ 0: 77
+ 1: 67
+ 2: 100
+ 3: 27
+ 4: 18
+ 5: 18
+ 6: 10
+HLT_e5_lhvloose_L1eEM5_bBeeM6000_L1All:
+ eventCount: 0
+ stepCounts:
+ 0: 12
+ 1: 12
+ 2: 12
+ 3: 10
+ 4: 10
+ 5: 10
+ stepFeatures:
+ 0: 21
+ 1: 21
+ 2: 41
+ 3: 13
+ 4: 13
+ 5: 13
+ 6: 7
+HLT_e5_lhvloose_L1eEM5_e3_lhvloose_L1eEM5_bBeeM6000_L1All:
+ eventCount: 0
+ stepCounts:
+ 0: 7
+ 1: 7
+ 2: 7
+ 3: 4
+ 4: 4
+ 5: 4
+ stepFeatures:
+ 0: 42
+ 1: 32
+ 2: 58
+ 3: 21
+ 4: 16
+ 5: 16
+ 6: 8
HLT_e5_lhvloose_bBeeM6000_L14J15:
eventCount: 0
stepCounts:
@@ -7186,24 +7339,41 @@ HLT_e5_lhvloose_bBeeM6000_L14J15:
4: 12
5: 12
6: 7
-HLT_e5_lhvloose_bBeeM6000_L1All:
+HLT_e5_lhvloose_bBeeM6000_L14jJ40:
eventCount: 0
stepCounts:
- 0: 16
- 1: 16
- 2: 14
- 3: 11
- 4: 11
- 5: 11
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 9
+ 4: 9
+ 5: 9
stepFeatures:
- 0: 35
- 1: 35
- 2: 54
- 3: 14
- 4: 14
- 5: 14
+ 0: 18
+ 1: 18
+ 2: 35
+ 3: 12
+ 4: 12
+ 5: 12
6: 7
HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled:
+ eventCount: 0
+ stepCounts:
+ 0: 12
+ 1: 12
+ 2: 12
+ 3: 10
+ 4: 10
+ 5: 10
+ stepFeatures:
+ 0: 21
+ 1: 21
+ 2: 41
+ 3: 13
+ 4: 13
+ 5: 13
+ 6: 7
+HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaledLegacy:
eventCount: 0
stepCounts:
0: 15
@@ -7221,6 +7391,23 @@ HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled:
5: 13
6: 7
HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary:
+ eventCount: 0
+ stepCounts:
+ 0: 12
+ 1: 12
+ 2: 12
+ 3: 10
+ 4: 10
+ 5: 10
+ stepFeatures:
+ 0: 21
+ 1: 21
+ 2: 41
+ 3: 13
+ 4: 13
+ 5: 13
+ 6: 7
+HLT_e5_lhvloose_bBeeM6000_L1BKeePrimaryLegacy:
eventCount: 0
stepCounts:
0: 16
@@ -7254,6 +7441,23 @@ HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15_MU5VF:
4: 5
5: 5
6: 4
+HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-eEM9jJ40_MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 5
+ 2: 5
+ 3: 4
+ 4: 4
+ 5: 4
+ stepFeatures:
+ 0: 9
+ 1: 9
+ 2: 20
+ 3: 6
+ 4: 6
+ 5: 6
+ 6: 4
HLT_e5_lhvloose_bBeeM6000_L1eEM26M:
eventCount: 0
stepCounts:
@@ -7271,40 +7475,91 @@ HLT_e5_lhvloose_bBeeM6000_L1eEM26M:
4: 4
5: 4
6: 3
+HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L14jJ40:
+ eventCount: 0
+ stepCounts:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 4
+ 4: 4
+ 5: 4
+ stepFeatures:
+ 0: 36
+ 1: 28
+ 2: 50
+ 3: 19
+ 4: 16
+ 5: 16
+ 6: 8
HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrescaled:
eventCount: 0
stepCounts:
- 0: 10
- 1: 10
- 2: 8
+ 0: 7
+ 1: 7
+ 2: 7
3: 4
4: 4
5: 4
stepFeatures:
- 0: 73
- 1: 63
- 2: 92
- 3: 25
- 4: 18
- 5: 18
- 6: 10
+ 0: 42
+ 1: 32
+ 2: 58
+ 3: 21
+ 4: 16
+ 5: 16
+ 6: 8
HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrimary:
eventCount: 0
stepCounts:
- 0: 11
- 1: 11
- 2: 9
+ 0: 7
+ 1: 7
+ 2: 7
3: 4
4: 4
5: 4
stepFeatures:
- 0: 77
- 1: 67
- 2: 100
- 3: 27
- 4: 18
- 5: 18
- 6: 10
+ 0: 42
+ 1: 32
+ 2: 58
+ 3: 21
+ 4: 16
+ 5: 16
+ 6: 8
+HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BPH-0M9-eEM9-eEM7_MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 1
+ 4: 1
+ 5: 1
+ stepFeatures:
+ 0: 14
+ 1: 10
+ 2: 26
+ 3: 8
+ 4: 6
+ 5: 6
+ 6: 4
+HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1eEM26M:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 12
+ 1: 8
+ 2: 12
+ 3: 6
+ 4: 6
+ 5: 6
+ 6: 2
HLT_e5_lhvloose_j70_j50a_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
eventCount: 0
stepCounts:
@@ -24007,8 +24262,6 @@ HLT_noalg_L1jXEC100:
eventCount: 10
HLT_noalg_L1jXEPerf100:
eventCount: 0
-HLT_noalg_LArPEBNoise_L1TAU8_EMPTY:
- eventCount: 0
HLT_noalg_LArPEBCalib_L1EM10VH:
eventCount: 14
stepCounts:
@@ -24033,6 +24286,8 @@ HLT_noalg_LArPEBNoise_L1EM7_EMPTY:
eventCount: 0
HLT_noalg_LArPEBNoise_L1EM7_FIRSTEMPTY:
eventCount: 0
+HLT_noalg_LArPEBNoise_L1TAU8_EMPTY:
+ eventCount: 0
HLT_tau0_mediumRNN_tracktwoMVA_tau0_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25:
eventCount: 1
stepCounts:
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index 11fd0e2f386d1f81da91034b357051274b9ac3d6..855f834a6c6bd50037fc2d1d15031e19ddf1dd46 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -54,9 +54,7 @@ HLT_2e5_lhmedium_j70_j50a_j0_DJMASS900j50_L1jMJJ-500-NFF:
eventCount: 0
stepFeatures:
0: 1
-HLT_2e5_lhvloose_bBeeM6000_L14J15:
- eventCount: 0
-HLT_2e5_lhvloose_bBeeM6000_L1All:
+HLT_2e5_lhvloose_L1EM3_bBeeM6000_L1All:
eventCount: 0
stepCounts:
0: 10
@@ -73,7 +71,42 @@ HLT_2e5_lhvloose_bBeeM6000_L1All:
4: 2
5: 2
6: 1
+HLT_2e5_lhvloose_L1eEM5_bBeeM6000_L1All:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 2
+ stepFeatures:
+ 0: 15
+ 1: 6
+ 2: 4
+ 3: 2
+HLT_2e5_lhvloose_bBeeM6000_L14J15:
+ eventCount: 0
+HLT_2e5_lhvloose_bBeeM6000_L14jJ40:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 3
+ 1: 2
+ 2: 2
+ 3: 1
HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaled:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 7
+ 1: 2
+ 2: 2
+ 3: 1
+HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaledLegacy:
eventCount: 0
stepCounts:
0: 3
@@ -91,6 +124,17 @@ HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaled:
5: 2
6: 1
HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimary:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 6
+ 1: 2
+ 2: 2
+ 3: 1
+HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimaryLegacy:
eventCount: 0
stepCounts:
0: 3
@@ -109,6 +153,8 @@ HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimary:
6: 1
HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5_MU5VF:
eventCount: 0
+HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-eEM9-eEM7_MU5VF:
+ eventCount: 0
HLT_2e5_lhvloose_bBeeM6000_L1eEM26M:
eventCount: 0
stepFeatures:
@@ -2252,9 +2298,7 @@ HLT_e5_lhtight_noringer_L1EM3:
3: 19
4: 19
5: 19
-HLT_e5_lhvloose_bBeeM6000_L14J15:
- eventCount: 0
-HLT_e5_lhvloose_bBeeM6000_L1All:
+HLT_e5_lhvloose_L1EM3_bBeeM6000_L1All:
eventCount: 0
stepCounts:
0: 24
@@ -2271,7 +2315,85 @@ HLT_e5_lhvloose_bBeeM6000_L1All:
4: 9
5: 9
6: 1
+HLT_e5_lhvloose_L1EM3_e3_lhvloose_L1EM3_bBeeM6000_L1All:
+ eventCount: 0
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 4
+ 3: 2
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 85
+ 1: 56
+ 2: 36
+ 3: 11
+ 4: 7
+ 5: 7
+ 6: 2
+HLT_e5_lhvloose_L1eEM5_bBeeM6000_L1All:
+ eventCount: 0
+ stepCounts:
+ 0: 12
+ 1: 12
+ 2: 6
+ 3: 6
+ 4: 6
+ 5: 6
+ stepFeatures:
+ 0: 15
+ 1: 15
+ 2: 9
+ 3: 6
+ 4: 6
+ 5: 6
+HLT_e5_lhvloose_L1eEM5_e3_lhvloose_L1eEM5_bBeeM6000_L1All:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 2
+ stepFeatures:
+ 0: 30
+ 1: 12
+ 2: 8
+ 3: 4
+HLT_e5_lhvloose_bBeeM6000_L14J15:
+ eventCount: 0
+HLT_e5_lhvloose_bBeeM6000_L14jJ40:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ stepFeatures:
+ 0: 3
+ 1: 3
+ 2: 2
+ 3: 1
+ 4: 1
+ 5: 1
HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled:
+ eventCount: 0
+ stepCounts:
+ 0: 6
+ 1: 6
+ 2: 3
+ 3: 3
+ 4: 3
+ 5: 3
+ stepFeatures:
+ 0: 7
+ 1: 7
+ 2: 4
+ 3: 3
+ 4: 3
+ 5: 3
+HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaledLegacy:
eventCount: 0
stepCounts:
0: 8
@@ -2289,6 +2411,22 @@ HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled:
5: 4
6: 1
HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary:
+ eventCount: 0
+ stepCounts:
+ 0: 5
+ 1: 5
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 3
+ 3: 2
+ 4: 2
+ 5: 2
+HLT_e5_lhvloose_bBeeM6000_L1BKeePrimaryLegacy:
eventCount: 0
stepCounts:
0: 6
@@ -2322,6 +2460,22 @@ HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15_MU5VF:
4: 3
5: 3
6: 1
+HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-eEM9jJ40_MU5VF:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
HLT_e5_lhvloose_bBeeM6000_L1eEM26M:
eventCount: 0
stepCounts:
@@ -2338,40 +2492,45 @@ HLT_e5_lhvloose_bBeeM6000_L1eEM26M:
3: 1
4: 1
5: 1
+HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L14jJ40:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ stepFeatures:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 2
HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrescaled:
eventCount: 0
stepCounts:
- 0: 3
- 1: 3
- 2: 2
- 3: 1
- 4: 1
- 5: 1
+ 0: 1
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 28
- 1: 18
- 2: 12
- 3: 6
- 4: 4
- 5: 4
- 6: 2
+ 0: 14
+ 1: 4
+ 2: 4
+ 3: 2
HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrimary:
eventCount: 0
stepCounts:
- 0: 3
- 1: 3
- 2: 2
- 3: 1
- 4: 1
- 5: 1
+ 0: 1
+ 1: 1
+ 2: 1
stepFeatures:
- 0: 24
- 1: 18
- 2: 12
- 3: 6
- 4: 4
- 5: 4
- 6: 2
+ 0: 12
+ 1: 4
+ 2: 4
+ 3: 2
+HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BPH-0M9-eEM9-eEM7_MU5VF:
+ eventCount: 0
+HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1eEM26M:
+ eventCount: 0
+ stepFeatures:
+ 0: 2
HLT_e5_lhvloose_j70_j50a_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF:
eventCount: 0
HLT_e5_lhvloose_j70_j50a_j0_DJMASS1000j50_xe50_tcpufit_L1jMJJ-500-NFF:
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 8a5c0cb44c7d40efae0352d1f8e97cb07989b8b7..d7d8d814dbd44506b4bc42c08390fa4579f88548 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
@@ -51,7 +51,7 @@ from .Physics_pp_run3_v1 import (PhysicsStream,
Topo3Group,
EOFL1MuGroup,
EOFBPhysL1MuGroup,
- EOFBeeLegGroup,
+ EOFBeePhIGroup,
)
DevGroup = ['Development']
@@ -160,8 +160,8 @@ def getDevSignatures():
ChainProp(name='HLT_g13_loose_g10_loose_PhysicsTLA_L113DR25-25M70-eEM12LeEM9L',l1SeedThresholds=['eEM12L','eEM9'],stream=['TLA'], groups=SupportPhIGroup+Topo2Group+DevGroup),
# ATR-19501, ATR-28162
- ChainProp(name='HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrimary', l1SeedThresholds=['EM3','EM3'], stream=['BphysDelayed'], groups=SupportLegGroup+BphysElectronGroup+['RATE:CPS_BKeePrimary']+DevGroup),
- ChainProp(name='HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrescaled', l1SeedThresholds=['EM3','EM3'], stream=['BphysDelayed'], groups=EOFBeeLegGroup+BphysElectronGroup+DevGroup),
+ ChainProp(name='HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrimary', l1SeedThresholds=['eEM5','eEM5'], stream=['BphysDelayed'], groups=SupportPhIGroup+BphysElectronGroup+['RATE:CPS_BKeePrimary']+DevGroup),
+ ChainProp(name='HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BKeePrescaled', l1SeedThresholds=['eEM5','eEM5'], stream=['BphysDelayed'], groups=EOFBeePhIGroup+BphysElectronGroup+DevGroup),
]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py
index cc831f54ae8b5cbef7de9ea20e6525e1f585ebac..f68005a524a3b8ea8f294e26cbde948a5f6dcbff 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py
@@ -183,10 +183,49 @@ def getL1LowLumi():
'L1_3J40', 'L1_2J15_XE55',
'L1_MU5VF_J40', 'L1_J75p31ETA49'
]
-
+
#####################################
def getL1BKeePrimary():
+ return [
+ 'L1_JPSI-1M5-eEM9', 'L1_JPSI-1M5-eEM15',
+ 'L1_BPH-0M9-eEM9-eEM7_MU5VF', # legacy 'L1_BPH-0M9-EM7-EM5_MU5VF'
+ 'L1_eEM24L_3eEM12L',
+ 'L1_eEM22M_jMJJ-300', # legacy 'L1_EM18VHI_MJJ-300'
+ 'L1_eEM18L_MU8F',
+ 'L1_BPH-0M9-eEM9-eEM7_2MU3V', # legacy 'L1_BPH-0M9-EM7-EM5_2MU3V'
+ 'L1_MU14FCH',
+ 'L1_MU8F_2MU5VF',
+ # legacy 'L1_MU8F_TAU20IM',
+ # legacy 'L1_MU8F_TAU12IM_3J12',
+ 'L1_jXE100', # legacy 'L1_XE50',
+ #'L1_eTAU60_2cTAU20M_jXE80', # legacy 'L1_TAU40_2TAU12IM_XE40', TriggerMenuMT:L1Seeds ERROR L1 item L1_eTAU60_2cTAU20M_jXE80 from L1_BKeePrimary seeds is not in current L1 menu
+ # legacy 'L1_EM15VHI_2TAU12IM_XE35',
+ 'L1_cTAU35M_2cTAU30M_2jJ55_3jJ50', # legacy 'L1_TAU25IM_2TAU20IM_2J25_3J20'
+ 'L1_cTAU30M_2cTAU20M_4jJ30p0ETA25', # legacy 'L1_TAU20IM_2TAU12IM_4J12p0ETA25'
+ # legacy 'L1_EM15VHI_2TAU12IM_4J12',
+ 'L1_jMJJ-700', # legacy 'L1_MJJ-700'
+ 'L1_jMJJ-500-NFF', # legacy 'L1_MJJ-500-NFF'
+ 'L1_jJ140_3jJ60', # legacy 'L1_J85_3J30',
+ 'L1_jJ80p0ETA25_2jJ55_jJ50p30ETA49', # legacy 'L1_J40p0ETA25_2J25_J20p31ETA49'
+ 'L1_jJ55p0ETA23_2jJ40p30ETA49', # legacy 'L1_J25p0ETA23_2J15p31ETA49'
+ 'L1_jJ160', # legacy 'L1_J100'
+ 'L1_4jJ40', # legacy 'L1_4J15'
+ 'L1_3jJ70p0ETA23', # legacy 'L1_3J35p0ETA23'
+ # legacy 'L1_3J15p0ETA25_XE40',
+ 'L1_2eEM24L',
+ 'L1_eEM18','L1_2eEM18', 'L1_2eEM18M', 'L1_2eEM18L',
+ 'L1_eEM26M', 'L1_eEM26L',
+ 'L1_eEM28M',
+ 'L1_2eEM10L_MU8F',
+ 'L1_MU18VFCH',
+ 'L1_eTAU80_2eTAU60',
+ 'L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55'
+ ]
+
+#####################################
+def getL1BKeePrimaryLegacy():
+
return [
'L1_JPSI-1M5-eEM9', 'L1_JPSI-1M5-eEM15',
'L1_BPH-0M9-eEM9-eEM7_MU5VF',
@@ -231,6 +270,31 @@ def getL1BKeePrimary():
#####################################
def getL1BKeePrescaled():
+ return [
+ 'L1_LFV-MU5VF',
+ 'L1_BPH-2M9-0DR15-MU5VFMU3V',
+ 'L1_BPH-2M9-0DR15-2MU3V',
+ 'L1_BPH-2M9-0DR15-2MU3V',
+ 'L1_BPH-0M9-eEM9-eEM7_MU5VF', # legacy 'L1_BPH-0M9-EM7-EM5_MU5VF',
+ 'L1_BPH-0DR3-eEM9jJ40_MU5VF', # legacy 'L1_BPH-0DR3-EM7J15_MU5VF'
+ 'L1_BPH-0DR3-eEM9jJ40_2MU3V', # legacy 'L1_BPH-0DR3-EM7J15_2MU3V'
+ 'L1_JPSI-1M5-eEM9', # legacy 'L1_JPSI-1M5-EM7'
+ 'L1_JPSI-1M5-eEM15', # legacy 'L1_JPSI-1M5-EM12'
+ 'L1_jJ90', # legacy 'L1_J50'
+ 'L1_jJ90_DETA20-jJ90J', # legacy 'L1_J50_DETA20-J50J'
+ # 'L1_jJ80', # legacy 'L1_J40' # CheckL1HLTConsistency ERROR [checkL1HLTConsistency] Missing L1 items: L1_jJ80
+ # 'L1_3J25p0ETA23', # exist in menu, but currently not used at HLT. We may drop as CTP output
+ # 'L1_EM20VH_3J20', # exist in menu, but currently not used at HLT. We may drop as CTP output
+ # 'L1_EM18VHI_3J20', # exist in menu, but currently not used at HLT. We may drop as CTP output
+ 'L1_eTAU80',
+ 'L1_eEM26L',
+ 'L1_eEM18',
+ 'L1_2eEM18L'
+ ]
+
+#####################################
+def getL1BKeePrescaledLegacy():
+
return [
'L1_LFV-MU5VF',
'L1_BPH-2M9-0DR15-MU5VFMU3V',
@@ -263,7 +327,9 @@ L1_multiseed_simple_getters = {
'L1_BS': getL1BSSeed,
'L1_LowLumi': getL1LowLumi,
'L1_BKeePrimary': getL1BKeePrimary,
+ 'L1_BKeePrimaryLegacy': getL1BKeePrimaryLegacy,
'L1_BKeePrescaled': getL1BKeePrescaled,
+ 'L1_BKeePrescaledLegacy': getL1BKeePrescaledLegacy,
}
valid_multiseeds = [
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 4cab3f31a5108c62318d13aa46ba1fe11fba5866..963b72785508b65d86afd6b892593d04cd924c1b 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
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#------------------------------------------------------------------------#
# MC_pp_run3_v1.py menu for the long shutdown development
@@ -214,15 +214,33 @@ def getMCSignatures():
ChainProp(name='HLT_e5_dnntight_L1EM3', groups=SingleElectronGroup),
# ATR-24268, K*ee chains for rate and acceptance studies
- ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1All', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
- ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1All', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_L1eEM5_bBeeM6000_L1All', l1SeedThresholds=['eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_2e5_lhvloose_L1eEM5_bBeeM6000_L1All', l1SeedThresholds=['eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_L1eEM5_e3_lhvloose_L1eEM5_bBeeM6000_L1All', l1SeedThresholds=['eEM5','eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_L1EM3_bBeeM6000_L1All', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_2e5_lhvloose_L1EM3_bBeeM6000_L1All', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_L1EM3_e3_lhvloose_L1EM3_bBeeM6000_L1All', l1SeedThresholds=['EM3','EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ #
+ ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1BKeePrimaryLegacy', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimaryLegacy', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaledLegacy', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaledLegacy', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ #
ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1eEM26M', l1SeedThresholds=['eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1eEM26M', l1SeedThresholds=['eEM5','eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1eEM26M', l1SeedThresholds=['eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ #
+ ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L14jJ40', l1SeedThresholds=['eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L14jJ40', l1SeedThresholds=['eEM5','eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L14jJ40', l1SeedThresholds=['eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L14J15', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L14J15', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ #
+ ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-eEM9-eEM7_MU5VF', l1SeedThresholds=['eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_e3_lhvloose_bBeeM6000_L1BPH-0M9-eEM9-eEM7_MU5VF', l1SeedThresholds=['eEM5','eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-eEM9jJ40_MU5VF', l1SeedThresholds=['eEM5'], stream=['BphysDelayed'], groups=BphysElectronGroup),
ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5_MU5VF', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup+LegacyTopoGroup),
ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15_MU5VF', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup+LegacyTopoGroup),
- ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L14J15', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
- ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L14J15', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=BphysElectronGroup),
-
# ATR-27780
ChainProp(name='HLT_g5_nopid_L1EM3', groups=SinglePhotonGroup+['PS:NoBulkMCProd']),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
index 981ae34cc9d0202a25a89e27a358a9b20f17d3cb..6cc6dfad4fecc34965da23df95f6783f62300508 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#------------------------------------------------------------------------#
# Physics_pp_run3_v1.py menu -- contains physics chains for MC and data
@@ -70,7 +70,7 @@ EOFL1MuGroup = ['EOF:L1Muon']
EOFEgammaLegGroup = ['EOF:EgammaLegacy']
EOFEgammaPhIGroup = ['EOF:EgammaPhaseI']
EOFBPhysL1MuGroup = ['EOF:BPhysL1Muon']
-EOFBeeLegGroup = ['EOF:BeeLegacy']
+EOFBeePhIGroup = ['EOF:BeePhaseI']
EOFTLALegGroup = ['EOF:TLALegacy']
EOFTLAPhIGroup = ['EOF:TLAPhaseI']
# For unconventional tracking chains (ATR-23797)
@@ -744,10 +744,10 @@ def setupMenu(menu_name):
# ATR-24268
# B->K*ee chains
- ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary', l1SeedThresholds=['EM3'], stream=['BphysDelayed','express'], groups=SupportLegGroup+BphysElectronGroup+['RATE:CPS_BKeePrimary'], monGroups=['bphysMon:online','bphysMon:shifter']),
- ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimary', l1SeedThresholds=['EM3'], stream=['BphysDelayed','express'], groups=SupportLegGroup+BphysElectronGroup+['RATE:CPS_BKeePrimary'], monGroups=['bphysMon:online','bphysMon:shifter']),
- ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=EOFBeeLegGroup+BphysElectronGroup),
- ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaled', l1SeedThresholds=['EM3'], stream=['BphysDelayed'], groups=EOFBeeLegGroup+BphysElectronGroup),
+ ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1BKeePrimary', l1SeedThresholds=['eEM5'], stream=['BphysDelayed','express'], groups=SupportPhIGroup+BphysElectronGroup+['RATE:CPS_BKeePrimary'], monGroups=['bphysMon:online','bphysMon:shifter']),
+ ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1BKeePrimary', l1SeedThresholds=['eEM5'], stream=['BphysDelayed','express'], groups=SupportPhIGroup+BphysElectronGroup+['RATE:CPS_BKeePrimary'], monGroups=['bphysMon:online','bphysMon:shifter']),
+ ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1BKeePrescaled', l1SeedThresholds=['eEM5'], stream=['BphysDelayed'], groups=EOFBeePhIGroup+BphysElectronGroup),
+ ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1BKeePrescaled', l1SeedThresholds=['eEM5'], stream=['BphysDelayed'], groups=EOFBeePhIGroup+BphysElectronGroup),
ChainProp(name='HLT_g35_medium_g25_medium_L1eEM9_EMPTY', l1SeedThresholds=['eEM9']*2, stream=['Late'], groups=PrimaryPhIGroup+MultiPhotonGroup),