From 5fb6179532f82b4a2ce71b604c131b0b15d44526 Mon Sep 17 00:00:00 2001
From: Savanna Marie Shaw <savanna.marie.shaw@cern.ch>
Date: Wed, 8 Jan 2020 15:18:51 +0100
Subject: [PATCH] Add single muon full scan trigger to LS2 menu
Adding a single muon full scan trigger to the menu so that we can test the full scan trigger reconstruction, also fixing the full scan sequence which was incorrect.
---
.../TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref | 2 ++
.../TrigValidation/TrigUpgradeTest/share/full_menu_build.ref | 2 ++
.../TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py | 1 +
.../TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py | 3 +--
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
index 2a237ab2c1c..8561be6aa14 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
@@ -162,6 +162,8 @@ TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4
TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 decisions 8 8 12 10 0
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 10 10 10 0 0 0 0 10
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 14 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 10 10 10 3 0 0 0 3
+TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisions 18 4 0 0 0
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU208 8 8 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 decisions 10 0 0 0 0
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU100 0 0 0 0 0 0 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index 598138b7cc7..ee8ede291e2 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -168,6 +168,8 @@ TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4
TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 decisions 2 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 20 20 1 0 0 0 0 1
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 2 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 20 20 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 decisions 1 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU2020 20 1 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 decisions 1 0 0 0 0
TrigSignatureMoniMT INFO HLT_noalg_L1EM3 20 20 0 0 0 0 0 20
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 564317c4a62..b1ef561d9ae 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -42,6 +42,7 @@ def setupMenu():
ChainProp(name='HLT_mu20_ivar_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu6_ivarmedium_L1MU6', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu6noL1_L1MU6', l1SeedThresholds=['FSNOSEED'], groups=SingleMuonGroup),
# ChainProp(name='HLT_mu6_mu6noL1_L1MU6', l1SeedThresholds=['MU6','FSNOSEED'], groups=MultiMuonGroup),
ChainProp(name='HLT_mu6_msonly_L1MU6', groups=SingleMuonGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
index c9ac3784947..5b7a6b77cb0 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
@@ -117,8 +117,7 @@ class MuonChainConfiguration(ChainConfigurationBase):
"Comb":[['getmuFast', 'getmuComb']],
"noL2Comb" : [['getmuFast'], ['getmuEFSA', 'getmuEFCB']],
"ivar":[['getmuFast', 'getmuComb', 'getmuIso']],
- #FP: this is tmp config for noL1, waiting for serial merging:
- "noL1":[['getmuFast', 'getmuComb', 'getmuIso'],['getFSmuEFSA', 'getFSmuEFCB', 'getEFCBEmpty']],
+ "noL1":[[],['getFSmuEFSA', 'getFSmuEFCB']],
"msonly":[['getmuFast', 'getmuMSEmpty'], ['getmuEFMS']],
"ivarmedium":[['getmuFast', 'getmuComb'], ['getmuEFSA', 'getmuEFCB', 'getmuEFIso']],
"invM":[[],['getmuInvM']],
--
GitLab