From b2f725a7434d60cc6b8006be9af75122f5536ccf Mon Sep 17 00:00:00 2001 From: Moe Wakida <wakida@hepl.phys.nagoya-u.ac.jp> Date: Sun, 12 Sep 2021 19:36:07 +0200 Subject: [PATCH] Support L1Muon Rename --- .../TrigMuonMonitoringMT/python/EFMuonMonConfig.py | 2 +- .../python/L2MuonSAIOMonConfig.py | 2 +- .../python/L2MuonSAMonConfig.py | 2 +- .../python/L2OverlapRemoverMonConfig.py | 2 +- .../python/L2muCombMonConfig.py | 2 +- .../python/MuonTriggerCountMTConfig.py | 2 +- .../python/TrigMuonEfficiencyMonConfig.py | 14 ++++++-------- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/EFMuonMonConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/EFMuonMonConfig.py index 1533991b8e8f..d0b14d23790c 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/EFMuonMonConfig.py +++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/EFMuonMonConfig.py @@ -10,7 +10,7 @@ def EFMuonMonConfig(helper): monAlg = helper.addAlgorithm(CompFactory.EFMuonMonMT,'EFMuonMonMT') # HLT_mu6_L1MU6 is test chain for small statistics, so it will be removed. - monAlg.MonitoredChains = ['HLT_mu6_L1MU6', 'HLT_mu26_ivarmedium_L1MU20', 'HLT_mu50_L1MU20', 'HLT_mu60_0eta105_msonly_L1MU20', 'HLT_2mu14_L12MU10'] + monAlg.MonitoredChains = ['HLT_mu6_L1MU5VF', 'HLT_mu26_ivarmedium_L1MU14FCH', 'HLT_mu50_L1MU14FCH', 'HLT_mu60_0eta105_msonly_L1MU14FCH', 'HLT_2mu14_L12MU8F', 'HLT_mu22_mu8noL1_L1MU14FCH'] monAlg.Group = GroupName # configuration of etaphi2D and Ratio plots for non-specific chain diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAIOMonConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAIOMonConfig.py index b7acd0286e18..5261cbb6183f 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAIOMonConfig.py +++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAIOMonConfig.py @@ -9,7 +9,7 @@ def L2MuonSAIOMonConfig(helper): GroupName = 'L2MuonSAIO' monAlg = helper.addAlgorithm(CompFactory.L2MuonSAIOMonMT,'L2MuonSAIOMonMT') - monAlg.MonitoredChains = ['HLT_2mu6_l2io_L12MU6', 'HLT_2mu14_l2io_L12MU10'] + monAlg.MonitoredChains = ['HLT_2mu6_l2io_L12MU5VF', 'HLT_2mu14_l2io_L12MU8F'] monAlg.Group = GroupName for chain in monAlg.MonitoredChains: diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAMonConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAMonConfig.py index bf6f3fff3c88..4e9426a7e745 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAMonConfig.py +++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAMonConfig.py @@ -10,7 +10,7 @@ def L2MuonSAMonConfig(helper): monAlg = helper.addAlgorithm(CompFactory.L2MuonSAMonMT,'L2MuonSAMonMT') # HLT_mu6_L1MU6 is test chain for small statistics, so it will be removed. - monAlg.MonitoredChains = ['HLT_mu6_L1MU6', 'HLT_mu26_ivarmedium_L1MU20', 'HLT_2mu14_L12MU10'] + monAlg.MonitoredChains = ['HLT_mu6_L1MU5VF', 'HLT_mu26_ivarmedium_L1MU14FCH', 'HLT_2mu14_L12MU8F'] monAlg.Group = GroupName # configuration of etaphi2D and Ratio plots for non-specific chain diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2OverlapRemoverMonConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2OverlapRemoverMonConfig.py index 6fd0399fe01c..51dfc670d7a1 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2OverlapRemoverMonConfig.py +++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2OverlapRemoverMonConfig.py @@ -10,7 +10,7 @@ def L2OverlapRemoverMonConfig(helper): monAlg = helper.addAlgorithm(CompFactory.L2OverlapRemoverMonMT,'L2OverlapRemoverMonMT') # HLT_mu6_L1MU6 is test chain for small statistics, so it will be removed. - monAlg.MonitoredChains = ['HLT_2mu14_L12MU10'] + monAlg.MonitoredChains = ['HLT_2mu14_L12MU8F'] monAlg.Group = GroupName diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2muCombMonConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2muCombMonConfig.py index 27742b57f752..fc1a93f0c21b 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2muCombMonConfig.py +++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2muCombMonConfig.py @@ -10,7 +10,7 @@ def L2muCombMonConfig(helper): monAlg = helper.addAlgorithm(CompFactory.L2muCombMonMT,'L2muCombMonMT') # HLT_mu6_L1MU6 is test chain for small statistics, so it will be removed. - monAlg.MonitoredChains = ['HLT_mu6_L1MU6', 'HLT_mu26_ivarmedium_L1MU20', 'HLT_2mu14_L12MU10'] + monAlg.MonitoredChains = ['HLT_mu6_L1MU5VF', 'HLT_mu26_ivarmedium_L1MU14FCH', 'HLT_2mu14_L12MU8F'] monAlg.Group = GroupName # configuration of etaphi2D and Ratio plots for non-specific chain diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/MuonTriggerCountMTConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/MuonTriggerCountMTConfig.py index 6d472f7cce9c..d11aa35deb5e 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/MuonTriggerCountMTConfig.py +++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/MuonTriggerCountMTConfig.py @@ -7,7 +7,7 @@ def MuonTriggerCountMTConfig(helper): from AthenaConfiguration.ComponentFactory import CompFactory GroupName = 'TriggerCount' - Chains = ['HLT_mu6_L1MU6', 'HLT_mu26_ivarmedium_L1MU20', 'HLT_mu50_L1MU20', 'HLT_mu60_0eta105_msonly_L1MU20', 'HLT_2mu14_L12MU10', 'HLT_mu22_mu8noL1_L1MU20'] + Chains = ['HLT_mu6_L1MU5VF', 'HLT_mu26_ivarmedium_L1MU14FCH', 'HLT_mu50_L1MU14FCH', 'HLT_mu60_0eta105_msonly_L1MU14FCH', 'HLT_2mu14_L12MU8F', 'HLT_mu22_mu8noL1_L1MU14FCH'] monAlg = helper.addAlgorithm(CompFactory.MuonTriggerCountMT,'MuonTriggerCountMT') # HLT_mu6_L1MU6 is test chain for small statistics, so it will be removed. diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonEfficiencyMonConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonEfficiencyMonConfig.py index eeae591308ee..17034a13b9d7 100644 --- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonEfficiencyMonConfig.py +++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonEfficiencyMonConfig.py @@ -22,14 +22,13 @@ def TrigMuonEfficiencyMonTTbarConfig(helper): from AthenaConfiguration.ComponentFactory import CompFactory # HLT_mu6_L1MU6 is test chain for small statistics, so it will be removed. - # To do: add noL1 chain - Chains = ['HLT_mu6_L1MU6', 'HLT_mu26_ivarmedium_L1MU20', 'HLT_mu50_L1MU20', 'HLT_mu60_0eta105_msonly_L1MU20', 'HLT_mu14_L1MU10'] + Chains = ['HLT_mu6_L1MU5VF', 'HLT_mu26_ivarmedium_L1MU14FCH', 'HLT_mu50_L1MU14FCH', 'HLT_mu60_0eta105_msonly_L1MU14FCH', 'HLT_mu14_L1MU8F', 'HLT_mu22_mu8noL1_L1MU14FCH'] for chain in Chains: monAlg = helper.addAlgorithm(CompFactory.TrigMuonEfficiencyMonMT,'TrigMuEff_ttbar_'+chain) - monAlg.EventTrigger = 'HLT_mu26_ivarmedium_L1MU20' - monAlg.TagTrigger = 'HLT_mu26_ivarmedium_L1MU20' + monAlg.EventTrigger = 'HLT_mu26_ivarmedium_L1MU14FCH' + monAlg.TagTrigger = 'HLT_mu26_ivarmedium_L1MU14FCH' monAlg.Method = 'TTbarTagAndProbe' monAlg.MonitoredChains = [chain] threshold, level1 = regex('HLT_mu([0-9]+).*_(L1MU[0-9]+)').match(chain).groups() @@ -51,14 +50,13 @@ def TrigMuonEfficiencyMonZTPConfig(helper): from AthenaConfiguration.ComponentFactory import CompFactory # HLT_mu6_L1MU6 is test chain for small statistics, so it will be removed. - # To do: add noL1 chain - Chains = ['HLT_mu6_L1MU6', 'HLT_mu26_ivarmedium_L1MU20', 'HLT_mu50_L1MU20', 'HLT_mu60_0eta105_msonly_L1MU20', 'HLT_mu14_L1MU10'] + Chains = ['HLT_mu6_L1MU5VF', 'HLT_mu26_ivarmedium_L1MU14FCH', 'HLT_mu50_L1MU14FCH', 'HLT_mu60_0eta105_msonly_L1MU14FCH', 'HLT_mu14_L1MU8F', 'HLT_mu22_mu8noL1_L1MU14FCH'] for chain in Chains: monAlg = helper.addAlgorithm(CompFactory.TrigMuonEfficiencyMonMT,'TrigMuEff_ZTP_'+chain) - monAlg.EventTrigger = 'HLT_mu26_ivarmedium_L1MU20' - monAlg.TagTrigger = 'HLT_mu26_ivarmedium_L1MU20' + monAlg.EventTrigger = 'HLT_mu26_ivarmedium_L1MU14FCH' + monAlg.TagTrigger = 'HLT_mu26_ivarmedium_L1MU14FCH' monAlg.Method = 'ZTagAndProbe' monAlg.MonitoredChains = [chain] threshold, level1 = regex('HLT_mu([0-9]+).*_(L1MU[0-9]+)').match(chain).groups() -- GitLab