From 1d8e9eb8b978255ca824c009725478c96e9dfaa9 Mon Sep 17 00:00:00 2001
From: Lidija Zivkovic <lidija.zivkovic@cern.ch>
Date: Wed, 2 Dec 2020 10:56:59 +0000
Subject: [PATCH] ATR-22422 - Muon triggers into LS2_v1 and Physics menus
---
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 94 ++++---------------
.../share/ref_data_v1Dev_build.ref | 42 +--------
.../python/HLTMenuConfig/Menu/LS2_v1.py | 14 +--
.../HLTMenuConfig/Menu/Physics_pp_run3_v1.py | 11 ++-
4 files changed, 35 insertions(+), 126 deletions(-)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index f1300dfd45bf..c93ae80da003 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -1904,7 +1904,7 @@ HLT_mu22_2mu4noL1_L1MU20:
3: 6
4: 2
5: 2
-HLT_mu22_mu8noL1_L1MU20:
+HLT_mu22_mu10noL1_L1MU20:
eventCount: 2
stepCounts:
0: 8
@@ -1920,22 +1920,22 @@ HLT_mu22_mu8noL1_L1MU20:
3: 6
4: 3
5: 3
-HLT_mu24_2mu4noL1_L1MU20:
- eventCount: 1
+HLT_mu22_mu8noL1_L1MU20:
+ eventCount: 2
stepCounts:
0: 8
1: 6
2: 5
3: 5
- 4: 1
- 5: 1
+ 4: 2
+ 5: 2
stepFeatures:
0: 10
1: 7
2: 6
3: 6
- 4: 2
- 5: 2
+ 4: 3
+ 5: 3
HLT_mu24_L1MU20:
eventCount: 5
stepCounts:
@@ -1990,64 +1990,48 @@ HLT_mu24_mu10noL1_L1MU20:
3: 6
4: 3
5: 3
-HLT_mu26_L1MU20:
- eventCount: 4
+HLT_mu24_mu8noL1_L1MU20:
+ eventCount: 2
stepCounts:
0: 8
1: 6
2: 5
- 3: 4
- stepFeatures:
- 0: 10
- 1: 7
- 2: 6
3: 5
-HLT_mu26_ivarmedium_L1MU20:
- eventCount: 3
- stepCounts:
- 0: 8
- 1: 6
- 2: 5
- 3: 4
- 4: 3
+ 4: 2
+ 5: 2
stepFeatures:
0: 10
1: 7
2: 6
- 3: 5
+ 3: 6
4: 3
-HLT_mu26_mu10noL1_L1MU20:
- eventCount: 1
+ 5: 3
+HLT_mu26_L1MU20:
+ eventCount: 4
stepCounts:
0: 8
1: 6
2: 5
3: 4
- 4: 1
- 5: 1
stepFeatures:
0: 10
1: 7
2: 6
3: 5
- 4: 2
- 5: 2
-HLT_mu26_mu8noL1_L1MU20:
- eventCount: 1
+HLT_mu26_ivarmedium_L1MU20:
+ eventCount: 3
stepCounts:
0: 8
1: 6
2: 5
3: 4
- 4: 1
- 5: 1
+ 4: 3
stepFeatures:
0: 10
1: 7
2: 6
3: 5
- 4: 2
- 5: 2
+ 4: 3
HLT_mu28_ivarmedium_L1MU20:
eventCount: 3
stepCounts:
@@ -2062,36 +2046,6 @@ HLT_mu28_ivarmedium_L1MU20:
2: 6
3: 4
4: 3
-HLT_mu28_mu8noL1_L1MU20:
- eventCount: 1
- stepCounts:
- 0: 8
- 1: 6
- 2: 5
- 3: 4
- 4: 1
- 5: 1
- stepFeatures:
- 0: 10
- 1: 7
- 2: 6
- 3: 4
- 4: 1
- 5: 1
-HLT_mu35_ivarmedium_L1MU20:
- eventCount: 2
- stepCounts:
- 0: 8
- 1: 6
- 2: 4
- 3: 3
- 4: 2
- stepFeatures:
- 0: 10
- 1: 7
- 2: 5
- 3: 3
- 4: 2
HLT_mu4_l2io_L1MU4:
eventCount: 11
stepCounts:
@@ -2248,16 +2202,6 @@ HLT_mu6_xe30_mht_L1XE10:
2: 12
3: 12
4: 11
-HLT_mu80_L1MU20:
- eventCount: 0
- stepCounts:
- 0: 8
- 1: 6
- 2: 1
- stepFeatures:
- 0: 10
- 1: 7
- 2: 1
HLT_mu80_msonly_3layersEC_L1MU20:
eventCount: 1
stepCounts:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 96e60e9bb182..d36aabbcce89 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -1002,7 +1002,7 @@ HLT_mu22_2mu4noL1_L1MU20:
stepFeatures:
0: 1
1: 1
-HLT_mu22_mu8noL1_L1MU20:
+HLT_mu22_mu10noL1_L1MU20:
eventCount: 0
stepCounts:
0: 1
@@ -1010,7 +1010,7 @@ HLT_mu22_mu8noL1_L1MU20:
stepFeatures:
0: 1
1: 1
-HLT_mu24_2mu4noL1_L1MU20:
+HLT_mu22_mu8noL1_L1MU20:
eventCount: 0
stepCounts:
0: 1
@@ -1050,7 +1050,7 @@ HLT_mu24_mu10noL1_L1MU20:
stepFeatures:
0: 1
1: 1
-HLT_mu26_L1MU20:
+HLT_mu24_mu8noL1_L1MU20:
eventCount: 0
stepCounts:
0: 1
@@ -1058,15 +1058,7 @@ HLT_mu26_L1MU20:
stepFeatures:
0: 1
1: 1
-HLT_mu26_ivarmedium_L1MU20:
- eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- stepFeatures:
- 0: 1
- 1: 1
-HLT_mu26_mu10noL1_L1MU20:
+HLT_mu26_L1MU20:
eventCount: 0
stepCounts:
0: 1
@@ -1074,7 +1066,7 @@ HLT_mu26_mu10noL1_L1MU20:
stepFeatures:
0: 1
1: 1
-HLT_mu26_mu8noL1_L1MU20:
+HLT_mu26_ivarmedium_L1MU20:
eventCount: 0
stepCounts:
0: 1
@@ -1090,22 +1082,6 @@ HLT_mu28_ivarmedium_L1MU20:
stepFeatures:
0: 1
1: 1
-HLT_mu28_mu8noL1_L1MU20:
- eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- stepFeatures:
- 0: 1
- 1: 1
-HLT_mu35_ivarmedium_L1MU20:
- eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- stepFeatures:
- 0: 1
- 1: 1
HLT_mu4_l2io_L1MU4:
eventCount: 0
stepCounts:
@@ -1192,14 +1168,6 @@ HLT_mu6_xe30_mht_L1XE10:
stepFeatures:
0: 1
1: 1
-HLT_mu80_L1MU20:
- eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- stepFeatures:
- 0: 1
- 1: 1
HLT_mu80_msonly_3layersEC_L1MU20:
eventCount: 0
stepCounts:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 0ff9e92cc19f..76c5c4fed7a6 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -61,18 +61,9 @@ def setupMenu():
ChainProp(name='HLT_mu24_ivarmedium_L1MU20', groups=SingleMuonGroup),
# Additional intermediate thresholds for validation comparisons to match with Physics_pp_v7_primaries menu
- ChainProp(name='HLT_mu28_ivarmedium_L1MU20', groups=SingleMuonGroup),
- ChainProp(name='HLT_mu35_ivarmedium_L1MU20', groups=SingleMuonGroup),
- ChainProp(name='HLT_2mu15_L12MU10', groups=SingleMuonGroup),
- ChainProp(name='HLT_3mu8_msonly_L13MU6', groups=SingleMuonGroup),
- ChainProp(name='HLT_mu80_L1MU20', groups=SingleMuonGroup),
- ChainProp(name='HLT_mu60_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu22_mu10noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
+ ChainProp(name='HLT_mu24_mu8noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
ChainProp(name='HLT_mu24_mu10noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
- ChainProp(name='HLT_mu26_mu8noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
- ChainProp(name='HLT_mu26_mu10noL1_L1MU20', l1SeedThresholds=['MU20', 'FSNOSEED'], groups=MultiMuonGroup),
- ChainProp(name='HLT_mu28_mu8noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
- ChainProp(name='HLT_mu22_2mu4noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
- ChainProp(name='HLT_mu24_2mu4noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
ChainProp(name="HLT_mu10_L1MU10", groups=SingleMuonGroup),
ChainProp(name='HLT_2mu4_L12MU4', groups=MultiMuonGroup),
@@ -88,7 +79,6 @@ def setupMenu():
ChainProp(name="HLT_mu8_L1MU6", groups=SingleMuonGroup),
ChainProp(name="HLT_mu14_L1MU10", groups=SingleMuonGroup),
ChainProp(name="HLT_mu24_L1MU20", groups=SingleMuonGroup),
- ChainProp(name="HLT_mu26_L1MU20", groups=SingleMuonGroup),
#ATR-21003
ChainProp(name='HLT_mu4_l2io_L1MU4', groups=SingleMuonGroup),
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 49dfe68fd079..e25976b7607a 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
@@ -60,23 +60,30 @@ def setupMenu():
#Planned Primaries
#-- 1 mu iso
ChainProp(name='HLT_mu26_ivarmedium_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu28_ivarmedium_L1MU20', groups=SingleMuonGroup),
#-- 1 mu
+ ChainProp(name='HLT_mu6_idperf_L1MU6', groups=SingleMuonGroup),
+ ChainProp(name="HLT_mu26_L1MU20", groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu24_idperf_L1MU20', groups=SingleMuonGroup),
ChainProp(name='HLT_mu50_L1MU20', groups=SingleMuonGroup),
ChainProp(name='HLT_mu60_0eta105_msonly_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu60_L1MU20', groups=SingleMuonGroup),
ChainProp(name='HLT_mu80_msonly_3layersEC_L1MU20', groups=SingleMuonGroup),
#-- 2 mu
ChainProp(name='HLT_mu22_mu8noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
ChainProp(name='HLT_2mu14_L12MU10', groups=MultiMuonGroup),
+ ChainProp(name='HLT_2mu15_L12MU10', groups=SingleMuonGroup),
#-- 2 mu iso invm
ChainProp(name='HLT_mu10_ivarmedium_mu10_10invm70_L12MU10', groups=MultiMuonGroup),
#-- 3 mu
ChainProp(name='HLT_mu20_2mu4noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
+ ChainProp(name='HLT_mu22_2mu4noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
ChainProp(name='HLT_3mu6_L13MU6', l1SeedThresholds=['MU6'], groups=MultiMuonGroup),
ChainProp(name='HLT_3mu6_msonly_L13MU6', l1SeedThresholds=['MU6'], groups=MultiMuonGroup),
+ ChainProp(name='HLT_3mu8_msonly_L13MU6', groups=SingleMuonGroup),
#-- 4 mu
ChainProp(name='HLT_4mu4_L14MU4', l1SeedThresholds=['MU4'], groups=MultiMuonGroup),
- ChainProp(name='HLT_mu6_idperf_L1MU6', groups=SingleMuonGroup),
- ChainProp(name='HLT_mu24_idperf_L1MU20', groups=SingleMuonGroup),
+
]
TriggerFlags.EgammaSlice.signatures = [
--
GitLab