From f592cf85b28f017b367adc64784aace13c3ee980 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 30 Jan 2023 13:33:15 +0100
Subject: [PATCH 1/2] TrigMonitoring: delete obsolete MonitCategory modules

Delete the obsolete "MonitCategory" modules and the `HLTMonTriggerList`.
This feature is replaced by `getHLTMonitoringAccess`. Egamma remains
for the moment as it is used directly in a few places.

Relates to ATR-23764 and ATR-26905.
---
 .../python/TrigBjetMonitCategory.py           |  56 ---
 .../python/TrigBphysMonitCategory.py          | 112 -----
 .../python/TrigBphysMonitoringConfig.py       |   4 +-
 .../python/TrigEgammaMonitoringMTConfig.py    |   4 +-
 .../python/HLTMonTriggerList.py               | 244 ----------
 .../python/TrigJetMonitCategory.py            | 432 ------------------
 .../python/TrigMETMonitCategory.py            |  48 --
 .../python/TrigMinBiasMonitCategory.py        |  75 ---
 .../python/TrigMuonMonitCategory.py           |  92 ----
 .../python/TrigTauMonitCategory.py            | 204 ---------
 .../python/TrigTauMonitoringConfig.py         |   4 +-
 11 files changed, 6 insertions(+), 1269 deletions(-)
 delete mode 100644 Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitCategory.py
 delete mode 100644 Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
 delete mode 100644 Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonTriggerList.py
 delete mode 100644 Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py
 delete mode 100644 Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py
 delete mode 100644 Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitCategory.py
 delete mode 100644 Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py
 delete mode 100644 Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py

diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitCategory.py b/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitCategory.py
deleted file mode 100644
index d2068e0c5364..000000000000
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitCategory.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-from __future__ import print_function
-
-
-# Used for combination MC, collisions or cosmics
-
-
-#General trigger chains  -  default values
-
-monitoring_bjet      = ["E_HLT_j35_boffperf_split","E_HLT_j55_boffperf_split","S_HLT_j85_gsc110_boffperf_split","S_HLT_j45_gsc55_boffperf_split","E_HLT_j225_gsc300_boffperf_split",
-                        "S_HLT_j30_0eta290_020jvt_pf_ftf_boffperf_L1J20","E_HLT_j45_0eta290_020jvt_pf_ftf_boffperf_L1J20","E_HLT_j60_0eta290_020jvt_pf_ftf_boffperf_L1J50",
-                        "E_HLT_j80_0eta290_020jvt_pf_ftf_boffperf_L1J50","E_HLT_j100_0eta290_020jvt_pf_ftf_boffperf_preselj80_L1J50","E_HLT_j150_0eta290_020jvt_pf_ftf_boffperf_preselj120_L1J100",
-                        "E_HLT_j200_0eta290_020jvt_pf_ftf_boffperf_preselj140_L1J100","E_HLT_j300_0eta290_020jvt_pf_ftf_boffperf_preselj225_L1J100"]
-
-monitoring_mujet     = ["S_HLT_mu4_j45_gsc55_boffperf_split_dr05_dz02","E_HLT_mu6_j60_gsc85_boffperf_split_dr05_dz02_L1BTAG-MU6J20","E_HLT_mu6_j110_gsc150_boffperf_split_dr05_dz02",
-                        "E_HLT_mu6_j60_gsc85_boffperf_split_dr05_dz02"]
-
-# triggers in pp collisions   -  used for q431 test
-
-monitoring_bjet_pp      = ["E_HLT_j35_boffperf_split","E_HLT_j55_boffperf_split","S_HLT_j85_gsc110_boffperf_split","S_HLT_j45_gsc55_boffperf_split","E_HLT_j225_gsc300_boffperf_split",
-                           "S_HLT_j30_0eta290_020jvt_pf_ftf_boffperf_L1J20","E_HLT_j45_0eta290_020jvt_pf_ftf_boffperf_L1J20","E_HLT_j60_0eta290_020jvt_pf_ftf_boffperf_L1J50",
-                           "E_HLT_j80_0eta290_020jvt_pf_ftf_boffperf_L1J50","E_HLT_j100_0eta290_020jvt_pf_ftf_boffperf_preselj80_L1J50","E_HLT_j150_0eta290_020jvt_pf_ftf_boffperf_preselj120_L1J100",
-                           "E_HLT_j200_0eta290_020jvt_pf_ftf_boffperf_preselj140_L1J100","E_HLT_j300_0eta290_020jvt_pf_ftf_boffperf_preselj225_L1J100"]
-
-monitoring_mujet_pp  = ["S_HLT_mu4_j45_gsc55_boffperf_split_dr05_dz02","E_HLT_mu6_j60_gsc85_boffperf_split_dr05_dz02_L1BTAG-MU6J20","E_HLT_mu6_j110_gsc150_boffperf_split_dr05_dz02",
-                        "E_HLT_mu6_j60_gsc85_boffperf_split_dr05_dz02"]
-
-################################
-
-#  cosmics triggers
-
-monitoring_bjet_cosmic = ["S_HLT_j0_perf_boffperf_L1RD0_EMPTY", "S_HLT_j0_perf_boffperf_L1J12_EMPTY", "S_HLT_j0_perf_boffperf_L1MU10"]
-
-
-# triggers for HI runs    -  used for q314 test
-
-monitoring_bjet_hi    = ["E_HLT_j40_boffperf_split", "S_HLT_j60_boffperf_split", "S_HLT_j100_boffperf_split"]
-
-
-monitoring_mujet_hi    = ["E_HLT_mu4_j20_ion_dr05", "S_HLT_mu4_j60_ion_dr05", "S_HLT_mu6_j30_ion_dr05"]
-
-# Triggers for MC  -  used for q221 test
-
-monitoring_bjet_validation = ["E_HLT_j35_boffperf_split","E_HLT_j55_boffperf_split","S_HLT_j85_gsc110_boffperf_split","S_HLT_j45_gsc55_boffperf_split","E_HLT_j225_gsc300_boffperf_split",
-                              "S_HLT_j30_0eta290_020jvt_pf_ftf_boffperf_L1J20","E_HLT_j45_0eta290_020jvt_pf_ftf_boffperf_L1J20","E_HLT_j60_0eta290_020jvt_pf_ftf_boffperf_L1J50",
-                              "E_HLT_j80_0eta290_020jvt_pf_ftf_boffperf_L1J50","E_HLT_j100_0eta290_020jvt_pf_ftf_boffperf_preselj80_L1J50","E_HLT_j150_0eta290_020jvt_pf_ftf_boffperf_preselj120_L1J100",
-                              "E_HLT_j200_0eta290_020jvt_pf_ftf_boffperf_preselj140_L1J100","E_HLT_j300_0eta290_020jvt_pf_ftf_boffperf_preselj225_L1J100"]
-
-
-
-monitoring_mujet_validation = ["S_HLT_mu4_j45_gsc55_boffperf_split_dr05_dz02","E_HLT_mu6_j60_gsc85_boffperf_split_dr05_dz02_L1BTAG-MU6J20","E_HLT_mu6_j110_gsc150_boffperf_split_dr05_dz02",
-                               "E_HLT_mu6_j60_gsc85_boffperf_split_dr05_dz02"]
-
-print ("In TrigBjetMonitCategory: monitoring_bjet")
-print (monitoring_bjet)
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
deleted file mode 100644
index 5482c818913b..000000000000
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-
-from AthenaConfiguration.AllConfigFlags import ConfigFlags
-
-monitoring_bphys = [
-                    # For individual chain monitoring folders, to fill DetailedIndividualChains - put them first
-                    'HLT_2mu4_bJpsimumu_L12MU4',
-                    'HLT_2mu4_bUpsimumu_L12MU4',
-                    'HLT_2mu4_bDimu_L12MU4',
-                    'HLT_mu6_mu4_bJpsimumu_L1MU6_2MU4',
-                    'HLT_mu6_mu4_bUpsimumu_L1MU6_2MU4',
-                    'HLT_mu6_mu4_bDimu_L1MU6_2MU4',
-                    'HLT_2mu6_bJpsimumu_L12MU6',
-                    'HLT_2mu6_bUpsimumu_L12MU6',
-                    'HLT_2mu6_bDimu_L12MU6',
-                    'HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6',
-                    'HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6',
-                    'HLT_mu11_mu6_bDimu_L1MU11_2MU6',
-                    'HLT_mu11_mu6_bPhi_L1MU11_2MU6',
-                    'HLT_mu11_mu6_bTau_L1MU11_2MU6',
-                    'HLT_mu11_mu6_bBmumu_L1MU11_2MU6',
-                    'HLT_mu11_mu6_bDimu2700_L1MU11_2MU6',
-                    'HLT_2mu4_bBmumux_BsmumuPhi_L12MU4',
-                    'HLT_mu6_mu4_bBmumux_BsmumuPhi_L1MU6_2MU4',
-                    'HLT_2mu4_bBmumux_BpmumuKp_L12MU4',
-                    'HLT_mu6_mu4_bBmumux_BpmumuKp_L1MU6_2MU4',
-                    # Other chains that used to be here
-                    'HLT_mu11_mu6_bDimu', 
-                    'HLT_mu11_mu6_bBmumuxv2', 
-                    'HLT_mu6_2mu4_bJpsi',
-                    'HLT_mu20_bJpsi_Trkloose', 
-                    'HLT_mu10_bJpsi_TrkPEBmon', 
-                    'HLT_2mu6_bJpsimumu_L1BPH-2M9-2MU6_BPH-2DR15-2MU6', 
-                    'HLT_2mu6_bUpsimumu_L1BPH-8M15-2MU6_BPH-0DR22-2MU6', 
-                    'HLT_mu11_mu6noL1_bTau_L1MU11_2MU6', 
-                    'HLT_mu11_mu6_bTau', 
-                    'HLT_2mu6_bDimu_L1BPH-2M9-2MU6_BPH-2DR15-2MU6', 
-                    'HLT_mu11_mu6_bDimu_novtx_noos', 
-                    'HLT_mu11_mu6_bJpsimumu',
-                    'HLT_mu11_mu6_bBmumu',
-                    'HLT_mu6_mu4_bUpsimumu_L1BPH-8M15-MU6MU4_BPH-0DR22-MU6MU4',
-                    'HLT_mu6_mu4_bJpsimumu_Lxy0_L1BPH-2M9-MU6MU4_BPH-0DR15-MU6MU4',
-                    'HLT_3mu4_bNocut',
-                    'HLT_2mu6_bBmumu',
-                    'HLT_2mu6_bBmumu_Lxy0_L1BPH-2M9-2MU6_BPH-2DR15-2MU6',
-                    'HLT_2mu6_bBmumu_L1BPH-2M9-2MU6_BPH-2DR15-2MU6',
-                    'HLT_2mu6_bBmumux_BsmumuPhi_L1BPH-2M9-2MU6_BPH-2DR15-2MU6',
-                    'HLT_mu6_bJpsi_Trkloose',
-                    'HLT_mu4_mu4_idperf_bJpsimumu_noid',
-                    ]
-
-primary_bphys = [ 
-                 # first should go those for generic folders (BMuMu, MultiMu etc)
-                 'HLT_mu11_mu6_bDimu', 
-                 'HLT_mu11_mu6_bBmumuxv2', 
-                 'HLT_mu6_2mu4_bJpsi',
-                 'HLT_mu10_bJpsi_TrkPEBmon', 
-                 'HLT_2mu6_bJpsimumu_L1BPH-2M9-2MU6_BPH-2DR15-2MU6', 
-                 'HLT_2mu6_bUpsimumu_L1BPH-8M15-2MU6_BPH-0DR22-2MU6', 
-                 'HLT_mu11_mu6_bTau', 
-                 'HLT_2mu6_bDimu_L1BPH-2M9-2MU6_BPH-2DR15-2MU6', 
-                 'HLT_mu11_mu6_bDimu_novtx_noos', 
-                 ]
-
-# adjust these lists if the code is run for Run-2 data reprocessing 
-# (in view of rel. 22 reprocessing, see https://its.cern.ch/jira/browse/ATR-22816)
-if not ConfigFlags.Input.isMC :
-  # use different chains for 2015-2016 data
-  if ConfigFlags.Input.RunNumber[0] >= 266904 and ConfigFlags.Input.RunNumber[0] <= 311481 :
-    primary_bphys = [
-                     'HLT_2mu6_bJpsimumu',
-                     'HLT_2mu6_bBmumuxv2',
-                     'HLT_3mu6_bJpsi',
-                     'HLT_mu18_bJpsi_Trkloose',
-                     'HLT_2mu6_bDimu_novtx_noos',
-                    ]
-  # remove the _L1 suffix from non-L1Topo chains as it was not used in data
-  import re
-  monitoring_bphys = [re.sub('_L1(?!BPH).*$','',str) for str in monitoring_bphys]
-  monitoring_bphys = list(dict.fromkeys(monitoring_bphys))
-  
-
-if ConfigFlags.Trigger.EDMVersion == 3 :
-  monitoring_bphys = [
-                      'HLT_2mu4_bJpsimumu_L12MU3V',
-                      'HLT_2mu4_bUpsimumu_L12MU3V',
-                      'HLT_2mu4_bDimu_L12MU3V',
-                      'HLT_mu6_mu4_bJpsimumu_L1MU5VF_2MU3V',
-                      'HLT_mu6_mu4_bUpsimumu_L1MU5VF_2MU3V',
-                      'HLT_mu6_mu4_bDimu_L1MU5VF_2MU3V',
-                      'HLT_2mu6_bJpsimumu_L12MU5VF',
-                      'HLT_2mu6_bUpsimumu_L12MU5VF',
-                      'HLT_2mu6_bDimu_L12MU5VF',
-                      'HLT_mu11_mu6_bJpsimumu_L1MU8VF_2MU5VF',
-                      'HLT_mu11_mu6_bUpsimumu_L1MU8VF_2MU5VF',
-                      'HLT_mu11_mu6_bDimu_L1MU8VF_2MU5VF',
-                      'HLT_mu11_mu6_bPhi_L1MU8VF_2MU5VF',
-                      'HLT_mu11_mu6_bTau_L1MU8VF_2MU5VF',
-                      'HLT_mu11_mu6_bBmumu_L1MU8VF_2MU5VF',
-                      'HLT_mu11_mu6_bDimu2700_L1MU8VF_2MU5VF',
-                      'HLT_2mu4_bBmumux_BsmumuPhi_L12MU3V',
-                      'HLT_mu6_mu4_bBmumux_BsmumuPhi_L1MU5VF_2MU3V',
-                      'HLT_2mu4_bBmumux_BpmumuKp_L12MU3V',
-                      'HLT_mu6_mu4_bBmumux_BpmumuKp_L1MU5VF_2MU3V',
-                     ]
-  primary_bphys = [
-                    'HLT_2mu4_bDimu_L12MU4',
-                  ]
-
-primary_bphys_pp = primary_bphys
-
-primary_bphys_hi = [ 'HLT_2mu4_bDimu', 'HLT_2mu4_bDimu_novtx_noos' ]
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
index d05e83ed6c03..f8383d538cd1 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 #
 
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -43,7 +43,7 @@ class TrigBphysMonAlgBuilder:
     self.__logger.info("TrigBphysMonToolBuilder.configureMode()")
     self._get_monitoring_mode_success = self.get_monitoring_mode()
     if not self._get_monitoring_mode_success :
-      self.__logger.warning("  HLTMonTriggerList: Error getting monitoring mode, default monitoring lists will be used.")
+      self.__logger.warning("Error getting monitoring mode, default monitoring lists will be used.")
     else:
       self.__logger.info("  Configuring for %s", self.data_type)
 
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
index e9c0855dee56..46324480f0b5 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 
 '''@file TrigEgammaMonitoringConfigRun3.py
 @author D. Maximov (histograms), Joao victor Pinto (core)
@@ -83,7 +83,7 @@ class TrigEgammaMonAlgBuilder:
     self.activate_onlineMonHypos = True
 
     if not self.get_monitoring_mode():
-      self.__logger.warning("HLTMonTriggerList: Error getting monitoring mode, default monitoring lists will be used.")
+      self.__logger.warning("Error getting monitoring mode, default monitoring lists will be used.")
     else:
       self.__logger.info("Configuring for %s", self.data_type)
 
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonTriggerList.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonTriggerList.py
deleted file mode 100644
index 8fb1ff71a72e..000000000000
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/HLTMonTriggerList.py
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.Logging import logging
-import TrigBjetMonitoring.TrigBjetMonitCategory as bjet
-import TrigBphysMonitoring.TrigBphysMonitCategory as bphys
-import TrigEgammaMonitoring.TrigEgammaMonitCategory as egamma
-import TrigJetMonitoring.TrigJetMonitCategory as jets
-import TrigMETMonitoring.TrigMETMonitCategory as met
-import TrigMinBiasMonitoring.TrigMinBiasMonitCategory as minbias
-import TrigMuonMonitoring.TrigMuonMonitCategory as muon
-import TrigTauMonitoring.TrigTauMonitCategory as tau
-
-class HLTMonTriggerList:
-  
-  # running mode config
-  _get_monitoring_mode_success = False
-  mc_mode = False
-  pp_mode = False
-  HI_mode = False
-  cosmic_mode = False
-  
-  # trigger lists
-  monitoring_mujet = []
-  monitoring_bjet = []
-  monitoring_bphys = []
-  primary_bphys = []
-  monitoring_egamma = []
-  primary_single_ele = []
-  primary_single_ele_iso = []
-  primary_single_ele_cutbased = []
-  primary_single_ele_cutbased_iso = []
-  primary_double_ele = []
-  primary_double_ele_cutbased = []
-  monitoring_ele_idperf = []
-  monitoring_ele_idperf_cutbased = []
-  monitoring_Zee = []
-  monitoring_Jpsiee = []
-  primary_single_pho = []
-  primary_double_pho = []
-  monitoring_l1jet = []
-  monitoring_jet = []
-  primary_l1jet = []
-  primary_jet = []
-  monitoring_met_shifter = []
-  monitoring_met_expert = []
-  monitoring_minbias = []
-  monitoring_muonNonIso = []
-  monitoring_muonIso = []
-  monitoring_MSonly = []
-  monitoring_muonEFFS = []
-  monitoring_muonLowpt = []
-  monitoring_muon_Support = []
-  monitoring_tau = []
-  monitoring_singleTau = []
-  
-  
-  def __init__(self):
-
-    self.set_HLTMonTrigList_default()
-
-    log = logging.getLogger('HLTMonTriggerList')
-
-    self._get_monitoring_mode_success = self.get_monitoring_mode()
-    
-    if self._get_monitoring_mode_success is False:
-      # what should be done in this case?
-      log.warning("Error getting monitoring mode, default monitoring lists will be used.")
-      
-    elif self.pp_mode is True:
-      log.info("Setting up pp monitoring.")
-      self.set_HLTMonTrigList_pp()
-      
-    elif self.mc_mode is True:
-      log.info("Setting up MC monitoring.")
-      self.set_HLTMonTrigList_mc()
-      
-    elif self.HI_mode is True:
-      log.info("Setting up HI monitoring.")
-      self.set_HLTMonTrigList_HI()
-      
-    elif self.cosmic_mode is True:
-      log.info("Setting up cosmic monitoring.")
-      self.set_HLTMonTrigList_cosmic()
-      
-
-  # Implementation of https://its.cern.ch/jira/browse/ATR-13200
-  def get_monitoring_mode(self):
-    # Set monitoring mode
-    from AthenaMonitoring.DQMonFlags import DQMonFlags
-    self.data_type = DQMonFlags.monManDataType()
-    
-    if self.data_type == 'monteCarlo':
-      self.mc_mode = True
-      return True
-    
-    elif self.data_type == 'collisions':
-      #singlebeam is included in collisions
-      self.pp_mode = True
-      return True
-    
-    elif self.data_type == 'heavyioncollisions':
-      #heavy ion is pPb or PbPb
-      self.HI_mode = True
-      return True
-    
-    elif self.data_type == 'cosmics':
-      self.cosmic_mode = True
-      return True
-    
-    else:
-      return False
-
-
-  # Config of default/running mode independent monitoring lists
-  def set_HLTMonTrigList_default(self):
-    # Monitoring lists (defaults) which are independent of running mode:
-    # These are the trigger lists that will be used unless they are overwritten based on the running mode. In this way the trigger lists can be updated based on running mode with no risk of a signature being left unmonitored
-    
-    # set the bjet and mujet triggers to the default values
-    self.monitoring_bjet = bjet.monitoring_bjet
-    self.monitoring_mujet = bjet.monitoring_mujet
-    
-    # set the bphys triggers to the default values
-    self.monitoring_bphys = bphys.monitoring_bphys
-    self.primary_bphys = bphys.primary_bphys
-    
-    # set the egamma triggers to the default values
-    self.monitoring_egamma = egamma.monitoring_egamma
-    self.primary_single_ele = egamma.primary_single_ele
-    self.primary_single_ele_iso = egamma.primary_single_ele_iso
-    self.primary_single_ele_cutbased = egamma.primary_single_ele_cutbased
-    self.primary_single_ele_cutbased_iso = egamma.primary_single_ele_cutbased_iso
-    self.primary_double_ele = egamma.primary_double_ele
-    self.primary_double_ele_cutbased = egamma.primary_double_ele_cutbased
-    self.monitoring_ele_idperf = egamma.monitoring_ele_idperf
-    self.monitoring_ele_idperf_cutbased = egamma.monitoring_ele_idperf_cutbased
-    self.monitoring_Zee = egamma.monitoring_Zee
-    self.monitoring_Jpsiee = egamma.monitoring_Jpsiee
-    self.primary_single_pho = egamma.primary_single_pho
-    self.primary_double_pho = egamma.primary_double_pho
-    
-    # set the jet triggers to the default values
-    self.monitoring_l1jet = jets.monitoring_l1jet
-    self.monitoring_jet = jets.monitoring_jet
-    self.primary_l1jet = jets.primary_l1jet
-    self.primary_jet = jets.primary_jet
-    
-    # set the met triggers to the default values
-    self.monitoring_met_shifter = met.monitoring_met_shifter
-    self.monitoring_met_expert = met.monitoring_met_expert
-    
-    # set the minbias triggers to the default values
-    self.monitoring_minbias = minbias.monitoring_minbias
-    
-    # set the muon triggers to the default values
-    self.monitoring_muonNonIso = muon.monitoring_muonNonIso
-    self.monitoring_muonIso = muon.monitoring_muonIso
-    self.monitoring_MSonly = muon.monitoring_MSonly
-    self.monitoring_muonEFFS = muon.monitoring_muonEFFS
-    self.monitoring_muonLowpt = muon.monitoring_muonLowpt
-    self.monitoring_muon_Support = muon.monitoring_muon_Support
-    
-    # set the tau triggers to the default values
-    self.monitoring_tau = tau.monitoring_tau
-    self.monitoring_singleTau = tau.monitoring_singleTau
-    
-    
-  # Config of monitoring lists which are dependent on running mode
-  def set_HLTMonTrigList_pp(self):
-    self.monitoring_bjet = bjet.monitoring_bjet_pp
-    self.monitoring_mujet = bjet.monitoring_mujet_pp
-    
-    self.primary_bphys = bphys.primary_bphys_pp
-    
-    self.monitoring_l1jet = jets.monitoring_l1jet_pp
-    self.monitoring_jet = jets.monitoring_jet_pp
-    self.primary_l1jet = jets.primary_l1jet_pp
-    self.primary_jet = jets.primary_jet_pp
-    
-    self.monitoring_met_shifter = met.monitoring_met_shifter_pp
-    self.monitoring_met_expert = met.monitoring_met_expert_pp
-    
-    self.monitoring_muonNonIso = muon.monitoring_muonNonIso_pp
-    self.monitoring_muonIso = muon.monitoring_muonIso_pp
-    self.monitoring_MSonly = muon.monitoring_MSonly_pp
-    self.monitoring_muonEFFS = muon.monitoring_muonEFFS_pp
-    self.monitoring_muonLowpt = muon.monitoring_muonLowpt
-    self.monitoring_muon_Support = muon.monitoring_muon_Support_pp
-    
-    self.monitoring_tau = tau.monitoring_tau_pp
-    
-    #override if both pp and MC are true
-    from AthenaCommon.GlobalFlags import globalflags
-    if globalflags.DataSource.get_Value() == 'geant4':
-      self.monitoring_tau = tau.monitoring_tau_validation
-
-  def set_HLTMonTrigList_HI(self):
-    self.monitoring_bjet = bjet.monitoring_bjet_hi
-    self.monitoring_mujet = bjet.monitoring_mujet_hi
-    
-    self.primary_bphys = bphys.primary_bphys_hi
-    
-    self.monitoring_l1jet = jets.monitoring_l1jet_hi
-    self.monitoring_jet = jets.monitoring_jet_hi
-    self.primary_l1jet = jets.primary_l1jet_hi
-    self.primary_jet = jets.primary_jet_hi
-    
-    self.monitoring_met_shifter = []
-    self.monitoring_met_expert = []
-    
-    self.monitoring_muonNonIso = muon.monitoring_muonNonIso_HI
-    self.monitoring_muonIso = muon.monitoring_muonIso_HI
-    self.monitoring_MSonly = muon.monitoring_MSonly_HI
-    self.monitoring_muonEFFS = muon.monitoring_muonEFFS_HI
-    self.monitoring_muonLowpt = muon.monitoring_muonLowpt
-    self.monitoring_muon_Support = muon.monitoring_muon_Support_HI
-    
-  def set_HLTMonTrigList_cosmic (self):
-    self.monitoring_bjet = bjet.monitoring_bjet_cosmic
-    
-    self.monitoring_l1jet = jets.monitoring_l1jet_cosmic
-    self.monitoring_jet = jets.monitoring_jet_cosmic
-    self.primary_l1jet = jets.primary_l1jet_cosmic
-    self.primary_jet = jets.primary_jet_cosmic
-    
-    self.monitoring_met_shifter = met.monitoring_met_shifter_cosmic
-    self.monitoring_met_expert = met.monitoring_met_expert_cosmic
-    
-    self.monitoring_tau = tau.monitoring_tau_cosmic
-    self.monitoring_singleTau = tau.monitoring_singleTau_cosmic
-    
-  def set_HLTMonTrigList_mc(self):
-    self.monitoring_bjet = bjet.monitoring_bjet_validation
-    self.monitoring_mujet = bjet.monitoring_mujet_validation
-    
-    self.monitoring_l1jet = jets.monitoring_l1jet_validation
-    self.monitoring_jet = jets.monitoring_jet_validation
-    self.primary_l1jet = jets.primary_l1jet_validation
-    self.primary_jet = jets.primary_jet_validation
-    
-    self.monitoring_tau = tau.monitoring_tau_validation
-    
-    
-hltmonList = HLTMonTriggerList()
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py
deleted file mode 100644
index 385e34923a57..000000000000
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py
+++ /dev/null
@@ -1,432 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## Monitoring triggers
-## Modify to the default naming scheme for menu-aware montioring.
-
-monitoring_l1jet = [ 'L1_J10',
-                     'L1_TE50',
-                     'L1_J15',
-                     'L1_J75',
-                     'L1_J100',
-                     'L1_J100.31ETA49',
-                     'L1_J400']
-
-
-
-monitoring_jet = [ 'j25',
-                   'j25_320eta490',
-                   'j60', 
-                   'j60_L1RD0_FILLED',
-                   'j60_280eta320',
-                   'j60_320eta490',
-                   'j260',
-                   'j360',
-                   'j460',
-                   'j460_a10_lcw_sub_L1J100',
-                   '4j45',
-                   '6j60',
-                   '5j60',
-                   '10j40_L14J20',
-                   'j15',
-                   'j45',
-                   'j175',
-                   'j420',
-                   'j260_nojcalib',
-                   'j260_320eta490',
-                   'j260_320eta490_nojcalib',
-                   'j460_a10_lcw_subjes_L1J100',
-                   'j460_a10r_L1J100',
-                   '4j120',
-                   '6j70',
-                   '6j55_0eta240_L14J15',
-                   'j35_nojcalib',
-                   'j45',
-                   'j420_L1J100',
-                   'j260_320eta490_L1J75_31ETA49',
-                   'j460_a10t_lcw_jes_L1J100',
-                   'j460_a10t_lcw_jes_30smcINF_L1J100',
-                   '2j330_a10t_lcw_jes_35smcINF_L1J100',
-                   '5j70_0eta240_L14J20',
-                   '3j200_L1J100',
-                   'j80_j60_L1J15',
-                   'j460_a10_lcw_subjes_L1SC111',
-                   'j460_a10t_lcw_jes_L1SC111',
-                   '2j330_a10t_lcw_jes_35smcINF_SC111',
- ]
-
-
-
-
-primary_l1jet                 = ['L1_J10',
-                                 'L1_TE50',
-                                 'L1_J15',
-                                 'L1_J75',
-                                 'L1_J100',
-                                 'L1_J100.31ETA49',
-                                 'L1_J400']
-
-
-
-primary_jet                = ['j25',
-                              'j25_320eta490',
-                              'j60', 
-                              'j60_L1RD0_FILLED',
-                              'j60_280eta320',
-                              'j60_320eta490',
-                              'j260',
-                              'j360',
-                              'j460',
-                              'j460_a10_lcw_sub_L1J100',
-                              '4j45',
-                              '6j60',
-                              '5j60',
-                              '10j40_L14J20',
-                              'j15',
-                              'j45',
-                              'j175',
-                              'j420',
-                              'j260_nojcalib',
-                              'j260_320eta490',
-                              'j260_320eta490_nojcalib',
-                              'j460_a10_lcw_subjes_L1J100',
-                              'j420_L1J100',
-                              'j260_320eta490_L1J75_31ETA49',
-                              'j460_a10r_L1J100',
-                              'j460_a10t_lcw_jes_L1J100',
-                              'j460_a10t_lcw_jes_30smcINF_L1J100',
-                              '2j330_a10t_lcw_jes_35smcINF_L1J100',
-                              '5j70_0eta240_L14J20',
-                              '3j200_L1J100',
-                              'j80_j60_L1J15',
-                              '4j120',
-                              '6j70',
-                              '6j55_0eta240_L14J15',
-                              'j35_nojcalib',
-                              'j45_320eta490',
-                              'j460_a10_lcw_subjes_L1SC111',
-                              'j460_a10t_lcw_jes_L1SC111',
-                              '2j330_a10t_lcw_jes_35smcINF_SC111',
-]
-
-
-
-########################## pp Config ###############################################
-
-
-monitoring_l1jet_pp = [ 'L1_J10',
-                        'L1_TE50',
-                        'L1_J15',
-                        'L1_J75',
-                        'L1_J100',
-                        'L1_J100.31ETA49',
-                        'L1_J400']
-
-
-monitoring_jet_pp = ['j25',
-                     'j25_320eta490',
-                     'j60', 
-                     'j60_L1RD0_FILLED',
-                     'j60_280eta320',
-                     'j60_320eta490',
-                     'j260',
-                     'j360',
-                     'j460',
-                     'j460_a10_lcw_sub_L1J100',
-                     '4j45',
-                     '6j60',
-                     '5j60',
-                     '10j40_L14J20',
-                     'j15',
-                     'j45',
-                     'j175',
-                     'j420',
-                     'j260_nojcalib',
-                     'j260_320eta490',
-                     'j260_320eta490_nojcalib',
-                     'j460_a10_lcw_subjes_L1J100',
-                     'j420_L1J100',
-                     'j260_320eta490_L1J75_31ETA49',
-                     'j460_a10r_L1J100',
-                     'j460_a10t_lcw_jes_L1J100',
-                     'j460_a10t_lcw_jes_30smcINF_L1J100',
-                     '2j330_a10t_lcw_jes_35smcINF_L1J100',
-                     '5j70_0eta240_L14J20',
-                     '3j200_L1J100',
-                     'j80_j60_L1J15',
-                     '4j120',
-                     '6j70',
-                     '6j55_0eta240_L14J15',
-                     'j35_nojcalib',
-                     'j45_320eta490',
-                     'j460_a10_lcw_subjes_L1SC111',
-                     'j460_a10t_lcw_jes_L1SC111',
-                     '2j330_a10t_lcw_jes_35smcINF_SC111',
-]
-
-
-
-primary_l1jet_pp                 = ['L1_J10',
-                                    'L1_TE50',
-                                    'L1_J15',
-                                    'L1_J75',
-                                    'L1_J100',
-                                    'L1_J100.31ETA49',
-                                    'L1_J400']
-
-
-primary_jet_pp                = ['j25',
-                                 'j25_320eta490',
-                                 'j60', 
-                                 'j60_L1RD0_FILLED',
-                                 'j60_280eta320',
-                                 'j60_320eta490',
-                                 'j260',
-                                 'j360',
-                                 'j460',
-                                 'j460_a10_lcw_sub_L1J100',
-                                 '4j45',
-                                 '6j60',
-                                 '5j60',
-                                 '10j40_L14J20',
-                                 'j15',
-                                 'j45',
-                                 'j175',
-                                 'j420',
-                                 'j260_nojcalib',
-                                 'j260_320eta490',
-                                 'j260_320eta490_nojcalib',
-                                 'j460_a10_lcw_subjes_L1J100',
-                                 'j420_L1J100',
-                                 'j260_320eta490_L1J75_31ETA49',
-                                 'j460_a10r_L1J100',
-                                 'j460_a10t_lcw_jes_L1J100',
-                                 'j460_a10t_lcw_jes_30smcINF_L1J100',
-                                 '2j330_a10t_lcw_jes_35smcINF_L1J100',
-                                 '5j70_0eta240_L14J20',
-                                 '3j200_L1J100',
-                                 'j80_j60_L1J15',
-                                 '4j120',
-                                 '6j70',
-                                 '6j55_0eta240_L14J15',
-                                 'j35_nojcalib',
-                                 'j45_320eta490',
-                                 'j460_a10_lcw_subjes_L1SC111',
-                                 'j460_a10t_lcw_jes_L1SC111',
-                                 '2j330_a10t_lcw_jes_35smcINF_SC111',
-]
-
-
-########################## validation Config ###############################################
-
-
-monitoring_l1jet_validation = [ 'L1_J10',
-                                'L1_TE50',
-                                'L1_J15',
-                                'L1_J75',
-                                'L1_J100',
-                                'L1_J100.31ETA49',
-                                'L1_J400']
-
-
-monitoring_jet_validation = ['j25',
-                             'j25_320eta490',
-                             'j60', 
-                             'j60_L1RD0_FILLED',
-                             'j60_280eta320',
-                             'j60_320eta490',
-                             'j260',
-                             'j360',
-                             'j460',
-                             'j460_a10_lcw_sub_L1J100',
-                             '4j45',
-                             '6j60',
-                             '5j60',
-                             '10j40_L14J20',
-                             'j15',
-                             'j45',
-                             'j175',
-                             'j420',
-                             'j260_nojcalib',
-                             'j260_320eta490',
-                             'j260_320eta490_nojcalib',
-                             'j460_a10_lcw_subjes_L1J100',
-                             'j420_L1J100',
-                             'j260_320eta490_L1J75_31ETA49',
-                             'j460_a10r_L1J100',
-                             'j460_a10t_lcw_jes_L1J100',
-                             'j460_a10t_lcw_jes_30smcINF_L1J100',
-                             '2j330_a10t_lcw_jes_35smcINF_L1J100',
-                             '5j70_0eta240_L14J20',
-                             '3j200_L1J100',
-                             'j80_j60_L1J15',
-                             '4j120',
-                             '6j70',
-                             '6j55_0eta240_L14J15',
-                             'j35_nojcalib',
-                             'j45_320eta490',
-                             'j460_a10_lcw_subjes_L1SC111',
-                             'j460_a10t_lcw_jes_L1SC111',
-                             '2j330_a10t_lcw_jes_35smcINF_SC111',
-]
-
-
-
-
-
-
-
-primary_l1jet_validation         = ['L1_J10',
-                                    'L1_TE50',
-                                    'L1_J15',
-                                    'L1_J75',
-                                    'L1_J100',
-                                    'L1_J100.31ETA49',
-                                    'L1_J400']
-
-
-primary_jet_validation        = ['j25',
-                                 'j25_320eta490',
-                                 'j60', 
-                                 'j60_L1RD0_FILLED',
-                                 'j60_280eta320',
-                                 'j60_320eta490',
-                                 'j260',
-                                 'j360',
-                                 'j460',
-                                 'j460_a10_lcw_sub_L1J100',
-                                 '4j45',
-                                 '6j60',
-                                 '5j60',
-                                 '10j40_L14J20',
-                                 'j15',
-                                 'j45',
-                                 'j175',
-                                 'j420',
-                                 'j260_nojcalib',
-                                 'j260_320eta490',
-                                 'j260_320eta490_nojcalib',
-                                 'j460_a10_lcw_subjes_L1J100',
-                                 'j420_L1J100',
-                                 'j260_320eta490_L1J75_31ETA49',
-                                 'j460_a10r_L1J100',
-                                 'j460_a10t_lcw_jes_L1J100',
-                                 'j460_a10t_lcw_jes_30smcINF_L1J100',
-                                 '2j330_a10t_lcw_jes_35smcINF_L1J100',
-                                 '5j70_0eta240_L14J20',
-                                 '3j200_L1J100',
-                                 'j80_j60_L1J15',
-                                 '4j120',
-                                 '6j70',
-                                 '6j55_0eta240_L14J15',
-                                 'j35_nojcalib',
-                                 'j45_320eta490',
-                                 'j460_a10_lcw_subjes_L1SC111',
-                                 'j460_a10t_lcw_jes_L1SC111',
-                                 '2j330_a10t_lcw_jes_35smcINF_SC111',
-]
-
-
-
-
-######################## Cosmics Config ############################################
-
-monitoring_l1jet_cosmic = ['L1_J10',
-                           'L1_J15']
-
-monitoring_jet_cosmic = ['j25']
-
-primary_l1jet_cosmic = ['L1_J10',
-                        'L1_J15']
-
-primary_jet_cosmic = ['j25']
-
-
-
-###################################### HI Config #######################################
-
-
-
-
-monitoring_l1jet_hi = ['L1_J10',
-                       'L1_TE50',
-                       'L1_J15',
-                       'L1_J75',
-                       'L1_J100',
-                       'L1_J100.31ETA49',
-                       'L1_J20',
-                       'L1_J400'] 
-
-                     
-
-monitoring_jet_hi = ['j25',
-                     'j25_320eta490',
-                     'j60', 
-                     'j60_L1RD0_FILLED',
-                     'j60_280eta320',
-                     'j60_320eta490',
-                     'j200_jes_PS',
-                     'j260',
-                     'j360',
-                     'j460_a10_lcw_sub_L1J100',
-                     'j80_xe80',
-                     '4j45',
-                     '6j60',
-                     '5j60',
-                     'ht850_L1J100',
-                     'j30_ion_L1TE20', #start HI chains
-                     'j30_L1TE20',
-                     'j75_ion_L1J20',
-                     'j85_ion_L1J20',
-                     'j100_ion_L1J20',
-                     'j150_ion_L1J30',
-                     'j75_L1J20',
-                     'j85_L1J20',
-                     'j100_L1J20',
-                     'j150_L1J30',
-                     'j45_320eta490_ion',
-                     'j45_320eta490',
-                     'j50_ion_2j30_ion_0eta490_L1J10',
-                     'j50_2j30_0eta490_L1J10'] 
-
-primary_l1jet_hi = ['L1_J10',
-                    'L1_TE50',
-                    'L1_J15',
-                    'L1_J75',
-                    'L1_J100',
-                    'L1_J100.31ETA49',
-                    'L1_J20',
-                    'L1_J400'] 
-                     
-                     
-
-primary_jet_hi = ['j25',
-                  'j25_320eta490',
-                  'j60', 
-                  'j60_L1RD0_FILLED',
-                  'j60_280eta320',
-                  'j60_320eta490',
-                  'j200_jes_PS',
-                  'j260',
-                  'j360',
-                  'j460_a10_lcw_sub_L1J100',
-                  'j80_xe80',
-                  '4j45',
-                  '6j60',
-                  '5j60',
-                  'ht850_L1J100',
-                  'j30_ion_L1TE20', #start HI chains
-                  'j30_L1TE20',
-                  'j75_ion_L1J20',
-                  'j85_ion_L1J20',
-                  'j100_ion_L1J20',
-                  'j150_ion_L1J30',
-                  'j75_L1J20',
-                  'j85_L1J20',
-                  'j100_L1J20',
-                  'j150_L1J30',
-                  'j45_320eta490_ion',
-                  'j45_320eta490',
-                  'j50_ion_2j30_ion_0eta490_L1J10',
-                  'j50_2j30_0eta490_L1J10'] 
-
-
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py
deleted file mode 100644
index 4a21402f606f..000000000000
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# l1 trigger to monitor: 
-met_triggers_l1_shifter = [
-    "L1_XE50",
-    "L1_XE55",
-]
-
-met_triggers_l1_expert = [
-    "L1_XE10",
-    "L1_XE60",
-]
-
-# hlt triggers to monitor
-met_triggers_hlt_shifter = [
-    "HLT_xe70_mht",    
-    "HLT_xe90_mht_L1XE50",    
-    "HLT_xe100_mht_L1XE50",    
-    "HLT_xe110_mht_L1XE50",
-    "HLT_xe90_pufit_L1XE50",
-    "HLT_xe100_pufit_L1XE50",
-    "HLT_xe100_pufit_L1XE55",
-    "HLT_xe110_pufit_L1XE50",
-    "HLT_xe110_pufit_L1XE55",
-    "HLT_xe110_pufit_xe70_L1XE50",
-    "HLT_xe110_pufit_xe65_L1XE50",
-] 
-
-met_triggers_hlt_expert = [
-    "HLT_xe30_cell_L1XE10",
-    "HLT_xe90_pufit_L1XE50",
-    "HLT_xe100_pufit_L1XE55",
-]
-
-
-monitoring_met_shifter = met_triggers_l1_shifter + met_triggers_hlt_shifter
-monitoring_met_expert = met_triggers_l1_expert + met_triggers_hlt_expert
-
-monitoring_met_shifter_pp = met_triggers_l1_shifter + met_triggers_hlt_shifter
-monitoring_met_expert_pp = met_triggers_l1_expert + met_triggers_hlt_expert
-
-monitoring_met_shifter_cosmic = met_triggers_l1_shifter + met_triggers_hlt_shifter
-monitoring_met_expert_cosmic = met_triggers_l1_expert + met_triggers_hlt_expert
-
-monitoring_met = monitoring_met_shifter
-monitoring_met_pp = monitoring_met_shifter_pp
-monitoring_met_cosmic = monitoring_met_shifter_cosmic
-
diff --git a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitCategory.py b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitCategory.py
deleted file mode 100644
index 9461f67364d1..000000000000
--- a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitCategory.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-#----NORMAL USER ACCESS-------
-
-triggers_pp = ["mb_sptrk",
-               #"mb_sptrk_noisesup",
-               #"mb_sptrk_costr",
-               "noalg_L1RD0_FILLED",
-               #"noalg_mb_L1RD0_EMPTY",
-               "noalg_mb_L1MBTS_2",
-               "mb_perf_L1MBTS_2",	
-               "mb_sp1800_hmtperf_L1TE5",
-               ]
-
-# PbPb triggers 2015
-triggers_hi = [ "mb_sp",
-                "mb_sptrk_ion_L1ZDC_A_C_VTE50",
-                "mb_perf_L1MBTS_1_1",	
-                "noalg_mb_L1TE50",
-                ]
-
-# pPb triggers 2016
-triggers_pPb = ["mb_sptrk",
-               #"mb_sptrk_noisesup",
-               #"mb_sptrk_costr", 
-               "noalg_L1RD0_FILLED",
-               #"noalg_mb_L1RD0_EMPTY",
-               "noalg_mb_L1MBTS_2",
-               "mb_perf_L1MBTS_2",
-               "mb_mbts_L1MBTS_2",
-               "noalg_mb_L1ZDC_A",
-               "noalg_mb_L1ZDC_C",
-               "mb_sp1800_hmtperf_L1TE5",
-               "noalg_mb_L1TE5",
-               "hi_upc_FgapAC_mb_sptrk_L1MBTS_2",
-               "hi_upc_FgapAC_mb_sptrk_exclusiveloose",
-               "mb_sptrk_exclusiveloose_L1ZDC",
-               ]
-
-#!----NORMAL USER ACCESS-------
-
-#----ADVANCED USER ACCESS-----
-#   PLEASE DO NOT MODIFY EXISTING CODE UNLESS YOU ARE PERFECTLY SURE WHAT YOU ARE DOING 
-
-#forces uniqueness of items on the list
-triggersFiltered_pp = []
-for x in triggers_pp:
-    if x not in triggersFiltered_pp:
-        triggersFiltered_pp.append(x)
-
-triggersFiltered_hi = []
-for x in triggers_hi:
-    if x not in triggersFiltered_hi:
-        triggersFiltered_hi.append(x)
-
-triggersFiltered_pPb = []
-for x in triggers_pPb:
-    if x not in triggersFiltered_pPb:
-        triggersFiltered_pPb.append(x)
-
-from RecExConfig.RecFlags import rec
-from AthenaCommon.Logging        import logging
-
-log = logging.getLogger( 'TrigMinBiasMonitoring' )
-
-if rec.doHeavyIon is True:
-    log.info('HI mode of min-bias trigger monitoring')
-    monitoring_minbias = triggersFiltered_hi     
-elif rec.doHIP is True:
-    log.info('doHI mode of min-bias trigger monitoring')
-    monitoring_minbias = triggersFiltered_pPb
-else:
-    log.info('pp mode of min-bias trigger monitoring')
-    monitoring_minbias = triggersFiltered_pp
-
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py
deleted file mode 100644
index 1ea5c8a1f45c..000000000000
--- a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
-
-from AthenaConfiguration.AllConfigFlags import ConfigFlags
-
-monitoring_muonNonIso = ['HLT_mu50']
-monitoring_muonNonIso_HI = ['HLT_mu8','HLT_mu3', 'HLT_mu4']#8TeV
-#monitoring_muonNonIso_HI = ['HLT_mu10','HLT_mu14']
-monitoring_muonNonIso_pp = ['HLT_mu50']
-if ConfigFlags.Trigger.EDMVersion == 3:
-    monitoring_muonNonIso = ['HLT_mu50_L1MU20']
-    monitoring_muonNonIso_pp = ['HLT_mu50_L1MU20']
-
-monitoring_muonIso = ['HLT_mu26_ivarmedium']
-monitoring_muonIso_HI = ['']
-monitoring_muonIso_pp = ['HLT_mu26_ivarmedium']
-if ConfigFlags.Trigger.EDMVersion == 3:
-    monitoring_muonIso = ['HLT_mu26_ivarmedium_L1MU20']
-    monitoring_muonIso_pp = ['HLT_mu26_ivarmedium_L1MU20']
-
-monitoring_MSonly = ['HLT_mu60_0eta105_msonly']
-monitoring_MSonly_HI = ['HLT_mu15_msonly']
-monitoring_MSonly_pp = ['HLT_mu60_0eta105_msonly']
-if ConfigFlags.Trigger.EDMVersion == 3:
-    monitoring_MSonly = ['HLT_mu60_0eta105_msonly_L1MU20']
-    monitoring_MSonly_pp = ['HLT_mu60_0eta105_msonly_L1MU20']
-
-#monitoring_muonEFFS = ['HLT_mu22_mu8noL1']
-monitoring_muonEFFS = ['HLT_mu24_mu8noL1']
-monitoring_muonEFFS_HI = ['HLT_mu4_mu4noL1']
-#monitoring_muonEFFS_pp = ['HLT_mu22_mu8noL1']
-monitoring_muonEFFS_pp = ['HLT_mu24_mu8noL1']
-
-monitoring_muon_Support = ['HLT_mu6_idperf','HLT_mu20_idperf']
-monitoring_muon_Support_HI = ['HLT_noalg_L1MU4','HLT_noalg_L1MU6']
-monitoring_muon_Support_pp = ['HLT_mu6_idperf','HLT_mu6_idperf']
-
-monitoring_muonLowpt = ["HLT_mu14"]
-
-
-
-### TE name of the hypos for the L2
-#L2 standalone
-monitoring_muonNonIso_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
-monitoring_muonNonIso_HI_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU6','L2_mu_SAhyp_Muon3GeV_v15a_MU4','L2_mu_SAhyp_Muon4GeV_v15a_MU4']#8TeV
-monitoring_muonNonIso_pp_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
-
-monitoring_muonIso_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
-monitoring_muonIso_HI_L2SAHypo = ['']
-monitoring_muonIso_pp_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
-
-monitoring_MSonly_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
-monitoring_MSonly_HI_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU11']
-monitoring_MSonly_pp_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
-
-monitoring_muonEFFS_L2SAHypo = ['']
-monitoring_muonEFFS_HI_L2SAHypo = ['']
-monitoring_muonEFFS_pp_L2SAHypo = ['']
-
-monitoring_muon_Support_L2SAHypo = ['L2_mu_hypo1','L2_mu_SAhyp_Muon6GeV_v15a_MU20']
-monitoring_muon_Support_HI_L2SAHypo = ['HLT_noalg_L1MU4','HLT_noalg_L1MU6']
-monitoring_muon_Support_pp_L2SAHypo = ['L2_mu_hypo1','L2_mu_SAhyp_Muon6GeV_v15a_MU20']
-
-monitoring_muonLowpt_L2SAHypo = ["L2_mu_SAhyp_Muon6GeV_v15a_MU10"]
-monitoring_muonLowpt_HI_L2SAHypo = ["L2_mu_SAhyp_Muon6GeV_v15a_MU10"]
-monitoring_muonLowpt_pp_L2SAHypo = ["L2_mu_SAhyp_Muon6GeV_v15a_MU10"]
-
-#L2 combined
-monitoring_muonNonIso_L2CBHypo = ['L2_mucombhyp_mu22_MU20']
-monitoring_muonNonIso_HI_L2CBHypo = ['L2_mucombhyp_mu8_MU6', 'L2_mucombhyp_mu3_MU4', 'L2_mucombhyp_mu4_MU4']#8TeV
-monitoring_muonNonIso_pp_L2CBHypo = ['L2_mucombhyp_mu22_MU20']
-
-monitoring_muonIso_L2CBHypo = ['L2_mucombhyp_mu22_MU20']
-monitoring_muonIso_HI_L2CBHypo = ['']
-monitoring_muonIso_pp_L2CBHypo = ['L2_mucombhyp_mu22_MU20']
-
-monitoring_MSonly_L2CBHypo = ['']
-monitoring_MSonly_HI_L2CBHypo = ['']
-monitoring_MSonly_pp_L2CBHypo = ['']
-
-monitoring_muonEFFS_L2CBHypo = ['']
-monitoring_muonEFFS_HI_L2CBHypo = ['']
-monitoring_muonEFFS_pp_L2CBHypo = ['']
-
-monitoring_muon_Support_L2CBHypo = ['L2_mucombhyp_mu6idperf_MU6','L2_mucombhyp_mu20idperf_MU20']
-monitoring_muon_Support_HI_L2CBHypo = ['HLT_noalg_L1MU4','HLT_noalg_L1MU6']
-monitoring_muon_Support_pp_L2CBHypo = ['L2_mucombhyp_mu6idperf_MU6','L2_mucombhyp_mu20idperf_MU20']
-
-monitoring_muonLowpt_L2CBHypo = ["L2_mucombhyp_mu14_MU10"]
-monitoring_muonLowpt_HI_L2CBHypo = ["L2_mucombhyp_mu14_MU10"]
-monitoring_muonLowpt_pp_L2CBHypo = ["L2_mucombhyp_mu14_MU10"]
-
-
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
deleted file mode 100644
index 2990566570db..000000000000
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-monitoring_singleTau = [
-    'tau25_medium1_tracktwo'
-]
-
-monitoring_tau = [
-    'tau0_ptonly_L1TAU8',
-    'tau0_ptonly_L1TAU60',
-    'tau25_idperf_track',
-    'tau25_idperf_tracktwo',
-    'tau25_perf_tracktwo',
-    'tau25_medium1_tracktwo',
-    'tau35_perf_tracktwo_tau25_perf_tracktwo',
-    'tau35_medium1_tracktwo_tau25_medium1_tracktwo',
-    'tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM',
-    'mu14_iloose_tau25_perf_tracktwo',
-    'tau160_idperf_track',
-    'tau160_idperf_tracktwo',
-    'tau160_perf_tracktwo',
-    'tau160_medium1_tracktwo',
-    'tau1_cosmic_track_L1MU4_EMPTY',
-    'tau1_cosmic_ptonly_L1MU4_EMPTY',
-    'tau8_cosmic_ptonly',
-    'tau8_cosmic_track'
-]
-
-monitoring_tau_pp = [
-    # Run 2 data reprocessing
-    'tau25_idperf_tracktwo',
-    'tau25_idperf_tracktwoEF',
-    'tau25_idperf_tracktwoMVA',
-    'tau25_perf_tracktwo',
-    'tau25_perf_tracktwoEF',
-    'tau25_perf_tracktwoMVA',
-    'tau25_medium1_tracktwo',
-    'tau25_medium1_tracktwoEF',
-    'tau25_mediumRNN_tracktwoMVA',
-    # 2015
-    'tau80_medium1_track',
-    'tau80_medium1_tracktwo',
-    'tau125_medium1_track',
-    'tau125_medium1_tracktwo',  
-    'tau160_medium1_tracktwo', # also 2016
-    'tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM',
-    'tau35_medium1_tracktwo_L1TAU20_tau25_medium1_tracktwo_L1TAU12',
-    'tau35_medium1_tracktwo_L1TAU20_xe70_L1XE45',
-    # 2016
-    'tau35_medium1_tracktwo_tau25_medium1_tracktwo',
-    'tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12',
-    'tau125_medium1_tracktwo_tau50_medium1_tracktwo_L1TAU12', 
-    'tau35_medium1_tracktwo_xe70_L1XE45',
-    # 2017
-    'tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25',
-    'tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25',
-    'tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I',
-    'tau35_medium1_tracktwo_tau25_medium1_tracktwo_xe50',
-    # 2018
-    'tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25',
-    'tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25',
-    'tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I',
-    'tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J25',
-    'tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dR30_L1DR-TAU20ITAU12I-J25',
-    'tau80_mediumRNN_tracktwoMVA_L1TAU60_tau35_mediumRNN_tracktwoMVA_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I',
-    'tau35_medium1_tracktwoEF_xe70_L1XE45',
-    'tau60_medium1_tracktwoEF_tau25_medium1_tracktwoEF_xe50',
-    'tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50',
-    'tau35_mediumRNN_tracktwoMVA_xe70_L1XE45',
-
-     # Run 3 
-    'tau0_ptonly_L1TAU100',
-    'tau25_idperf_tracktwoMVA_L1TAU12IM',
-    'tau25_idperf_tracktwoMVABDT_L1TAU12IM',
-    'tau25_perf_tracktwoMVA_L1TAU12IM',
-    'tau25_perf_tracktwoMVABDT_L1TAU12IM',
-    'tau25_mediumRNN_tracktwoMVA_L1TAU12IM',
-    'tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM',
-    'tau80_medium1_tracktwo_L1TAU60',
-    'tau160_idperf_track_L1TAU100',
-    'tau160_idperf_tracktwo_L1TAU100',
-    'tau160_idperf_tracktwoEF_L1TAU100',
-    'tau160_idperf_tracktwoMVA_L1TAU100',
-    'tau160_idperf_tracktwoMVABDT_L1TAU100',
-    'tau160_perf_track_L1TAU100',
-    'tau160_perf_tracktwo_L1TAU100',
-    'tau160_perf_tracktwoEF_L1TAU100',
-    'tau160_perf_tracktwoMVA_L1TAU100',
-    'tau160_perf_tracktwoMVABDT_L1TAU100',
-    'tau160_mediumRNN_tracktwoMVA_L1TAU100', # valid also in 2018 for 2 data reprocessing
-    'tau160_mediumRNN_tracktwoMVABDT_L1TAU100',
-    'tau160_medium1_track_L1TAU100',
-    'tau160_medium1_tracktwo_L1TAU100', # valid also in 2017 for 2 data reprocessing
-    'tau160_medium1_tracktwoEF_L1TAU100', # valid also in 2018 for 2 data reprocessing
-    'tau180_mediumRNN_tracktwoLLP_L1TAU100', #llp
-    'tau180_tightRNN_tracktwoLLP_L1TAU100',  #llp
-    'tau200_mediumRNN_tracktwoLLP_L1TAU100', #llp
-    'tau200_tightRNN_tracktwoLLP_L1TAU100',  #llp
-    'tau200_mediumRNN_tracktwoMVA_L1TAU100',
-    'tau200_mediumRNN_tracktwoMVABDT_L1TAU100',
-    'tau200_medium1_track_L1TAU100',
-    'tau200_medium1_tracktwo_L1TAU100', # valid also in 2017 for 2 data reprocessing
-    'tau200_medium1_tracktwoEF_L1TAU100',
-    # Will keep this commented out for now
-    #'tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40',
-    #'tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I',
-    #'tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J25'
-    #'HLT_tau80_mediumRNN_tracktwoLLP_tau60_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40',
-    #'HLT_tau80_mediumRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40',
-    #'HLT_tau80_tightRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40',
-    #'HLT_tau100_mediumRNN_tracktwoLLP_tau80_mediumRNN_tracktwoLLP_03dRAB_L1TAU60_2TAU40',
-    
-    # Phase-1
-    'tau25_mediumRNN_tracktwoMVABDT_L1eTAU12',
-    'tau25_mediumRNN_tracktwoMVABDT_L1eTAU12M',
-    'tau35_mediumRNN_tracktwoMVABDT_L1eTAU20',
-    'tau160_mediumRNN_tracktwoMVABDT_L1eTAU100',
-    'tau200_mediumRNN_tracktwoMVABDT_L1eTAU100',
-    'tau180_mediumRNN_tracktwoLLP_L1eTAU100',
-
-]
-
-monitoring_tau_validation = [
-
-        # tau0
-        'tau0_ptonly_L1TAU8',
-        'tau0_ptonly_L1TAU60',
-        # tau25
-        'tau25_ptonly_L1TAU12IM',
-        'tau25_idperf_track_L1TAU12IM',
-        'tau25_idperf_tracktwo_L1TAU12IM',
-        'tau25_idperf_tracktwoEF_L1TAU12IM',
-        'tau25_idperf_tracktwoMVA_L1TAU12IM',
-        'tau25_idperf_tracktwoMVABDT_L1TAU12IM',
-        'tau25_perf_track_L1TAU12IM',
-        'tau25_perf_tracktwo_L1TAU12IM',
-        'tau25_perf_tracktwoEF_L1TAU12IM',
-        'tau25_perf_tracktwoMVA_L1TAU12IM',
-        'tau25_perf_tracktwoMVABDT_L1TAU12IM',
-        'tau25_looseRNN_tracktwoMVA_L1TAU12IM',
-        'tau25_looseRNN_tracktwoMVABDT_L1TAU12IM',       
-        'tau25_mediumRNN_tracktwoMVA_L1TAU12IM',
-        'tau25_mediumRNN_tracktwoMVABDT_L1TAU12IM',
-        'tau25_tightRNN_tracktwoMVA_L1TAU12IM',
-        'tau25_tightRNN_tracktwoMVABDT_L1TAU12IM',
-        'tau25_medium1_track_L1TAU12IM',
-        'tau25_medium1_tracktwo_L1TAU12IM',
-        'tau25_medium1_tracktwoEF_L1TAU12IM',
-        # tau35
-        'tau35_ptonly_L1TAU20IM',
-        'tau35_idperf_track_L1TAU20IM',
-        'tau35_idperf_tracktwo_L1TAU20IM',
-        'tau35_idperf_tracktwoEF_L1TAU20IM',
-        'tau35_idperf_tracktwoMVA_L1TAU20IM',
-        'tau35_idperf_tracktwoMVABDT_L1TAU20IM',
-        'tau35_perf_track_L1TAU20IM',
-        'tau35_perf_tracktwo_L1TAU20IM',
-        'tau35_perf_tracktwoEF_L1TAU20IM',
-        'tau35_perf_tracktwoMVA_L1TAU20IM',
-        'tau35_perf_tracktwoMVABDT_L1TAU20IM',
-        'tau35_looseRNN_tracktwoMVA_L1TAU20IM',
-        'tau35_looseRNN_tracktwoMVABDT_L1TAU20IM',
-        'tau35_mediumRNN_tracktwoMVA_L1TAU20IM',
-        'tau35_mediumRNN_tracktwoMVABDT_L1TAU20IM',
-        'tau35_tightRNN_tracktwoMVA_L1TAU20IM',
-        'tau35_tightRNN_tracktwoMVABDT_L1TAU20IM',
-        # tau160
-        'tau160_ptonly_L1TAU100',
-        'tau160_idperf_track_L1TAU100',
-        'tau160_idperf_tracktwo_L1TAU100',
-        'tau160_idperf_tracktwoEF_L1TAU100',
-        'tau160_idperf_tracktwoMVA_L1TAU100',
-        'tau160_idperf_tracktwoMVABDT_L1TAU100',
-        'tau160_perf_track_L1TAU100',
-        'tau160_perf_tracktwo_L1TAU100',
-        'tau160_perf_tracktwoEF_L1TAU100',
-        'tau160_perf_tracktwoMVA_L1TAU100',
-        'tau160_perf_tracktwoMVABDT_L1TAU100',
-        'tau160_mediumRNN_tracktwoMVA_L1TAU100',
-        'tau160_mediumRNN_tracktwoMVABDT_L1TAU100',
-        'tau160_medium1_track_L1TAU100',
-        'tau160_medium1_tracktwo_L1TAU100',
-        'tau160_medium1_tracktwoEF_L1TAU100',
-        # tau180
-        'tau180_mediumRNN_tracktwoLLP_L1TAU100',
-        'tau180_tightRNN_tracktwoLLP_L1TAU100',
-        #tau200
-        'tau200_mediumRNN_tracktwoLLP_L1TAU100',
-        'tau200_tightRNN_tracktwoLLP_L1TAU100',
-        # Phase I
-        'tau25_mediumRNN_tracktwoMVABDT_L1eTAU12',
-        'tau25_mediumRNN_tracktwoMVABDT_L1eTAU12M',
-        'tau35_mediumRNN_tracktwoMVABDT_L1eTAU20',
-        'tau160_mediumRNN_tracktwoMVABDT_L1eTAU100',
-]
-
-monitoring_tau_cosmic = [
-    'tau1_cosmic_track_L1MU4_EMPTY',
-    'tau1_cosmic_ptonly_L1MU4_EMPTY',
-    'tau8_cosmic_ptonly',
-    'tau8_cosmic_track'
-]
-
-
-monitoring_singleTau_cosmic = 'tau8_cosmic_track'
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
index f9a740c28781..aa38ac05b387 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentFactory import CompFactory
 
@@ -31,7 +31,7 @@ class TrigTauMonAlgBuilder:
     self.__logger.info("TrigTauMonToolBuilder.configureMode()")
     self._get_monitoring_mode_success = self.get_monitoring_mode()
     if self._get_monitoring_mode_success is False:
-      self.__logger.warning("HLTMonTriggerList: Error getting monitoring mode, default monitoring lists will be used.")
+      self.__logger.warning("Error getting monitoring mode, default monitoring lists will be used.")
     else:
       self.__logger.info("Configuring for %s", self.data_type)
 
-- 
GitLab


From e18d0aeaf95e77a85bb3996186f6a8d3060697b8 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 30 Jan 2023 13:35:55 +0100
Subject: [PATCH 2/2] AthenaMonitoring: remove usage of obsolete
 HLTMonTriggerList

Remove the usage of the legacy `HLTMonTriggerList` and the now
obsolete use of `TriggerTranslatorSimple` in `AthMonitorAlgorithm`.
---
 .../AthenaMonitoring/AthMonitorAlgorithm.h    | 15 +------
 .../python/AthMonitorCfgHelper.py             | 39 -------------------
 .../share/TrigDecTool_jobOptions.py           | 30 +-------------
 .../src/AthMonitorAlgorithm.cxx               | 36 +----------------
 4 files changed, 4 insertions(+), 116 deletions(-)

diff --git a/Control/AthenaMonitoring/AthenaMonitoring/AthMonitorAlgorithm.h b/Control/AthenaMonitoring/AthenaMonitoring/AthMonitorAlgorithm.h
index f3bf75810b25..3c29e635efe8 100644
--- a/Control/AthenaMonitoring/AthenaMonitoring/AthMonitorAlgorithm.h
+++ b/Control/AthenaMonitoring/AthenaMonitoring/AthMonitorAlgorithm.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -22,7 +22,6 @@
 #include "AthenaMonitoringKernel/GenericMonitoringTool.h"
 #include "AthenaMonitoring/IDQFilterTool.h"
 #include "AthenaMonitoring/IMonitorToolBase.h"
-#include "AthenaMonitoring/ITriggerTranslatorTool.h"
 #include "AthenaMonitoringKernel/Monitored.h"
 
 #include "TrigDecisionTool/TrigDecisionTool.h"
@@ -334,23 +333,11 @@ public:
     virtual StatusCode parseList( const std::string& line, std::vector<std::string>& result ) const;
 
 
-    /**
-     * Expands trigger categories.
-     * 
-     * Searches through the vector of trigger names. If a trigger category is found, it finds the 
-     * constituent triggers in that category and expands the vector to include each one.
-     * 
-     * @param vTrigChainNames A vector of triggers which is modified.
-     */
-    virtual void unpackTriggerCategories( std::vector<std::string>& vTrigChainNames ) const;
-
-
 protected:
     // Using the new way to declare JO properties: Gaudi::Property<int> m_myProperty {this,"MyProperty",0};
     ToolHandleArray<GenericMonitoringTool> m_tools {this,"GMTools",{}}; ///< Array of Generic Monitoring Tools
     // Keep TDT public until final decision from trigger on interface
     PublicToolHandle<Trig::TrigDecisionTool> m_trigDecTool {this, "TrigDecisionTool",""}; ///< Tool to tell whether a specific trigger is passed
-    ToolHandle<ITriggerTranslatorTool> m_trigTranslator {this,"TriggerTranslatorTool",""}; ///< Tool to unpack trigger categories into a trigger list
     ToolHandleArray<IDQFilterTool> m_DQFilterTools {this,"FilterTools",{}}; ///< Array of Data Quality filter tools
 
     SG::ReadCondHandleKey<LuminosityCondData> m_lumiDataKey
diff --git a/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py b/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
index 5a8d975a8b9e..2ca798ba103c 100644
--- a/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
+++ b/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
@@ -69,7 +69,6 @@ class AthMonitorCfgHelper(object):
         algObj.DataType = self.flags.DQ.DataType
         if self.flags.DQ.useTrigger:
             algObj.TrigDecisionTool = self.resobj.getPublicTool("TrigDecisionTool")
-            algObj.TriggerTranslatorTool = self.resobj.popToolsAndMerge(getTriggerTranslatorToolSimple(self.flags))
 
         if self.flags.DQ.enableLumiAccess:
             algObj.EnableLumi = True
@@ -342,41 +341,3 @@ def getDQTHistSvc(flags):
                                                                 flags.Output.HISTFileName)]
     result.addService(histsvc)
     return result
-
-def getTriggerTranslatorToolSimple(flags):
-    ''' Set up the Trigger Translator Tool; no reason for this to be called
-        outside the DQ setup code. '''
-    import logging
-    from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-    from AthenaConfiguration.ComponentFactory import CompFactory
-    from TrigHLTMonitoring.HLTMonTriggerList import hltmonList
-    import collections.abc
-
-    TriggerTranslatorToolSimple=CompFactory.TriggerTranslatorToolSimple
-    
-    tdt_local_logger = logging.getLogger('getTriggerTranslatorToolSimple')
-    tdt_mapping = {}
-    for tdt_menu, tdt_menu_item in hltmonList.__dict__.items():
-        if not isinstance(tdt_menu_item, collections.abc.Iterable):
-            continue
-        # work around possibly buggy category items
-        if isinstance(tdt_menu_item, str):
-            tdt_local_logger.debug('String, not list: %s', tdt_menu)
-            tdt_menu_item = [tdt_menu_item]
-            if len([_ for _ in tdt_menu_item if not (_.startswith('HLT_') or _.startswith('L1'))]) != 0:
-                tdt_local_logger.debug('Bad formatting: %s', tdt_menu)
-        tdt_menu_item = [_ if (_.startswith('HLT_') or _.startswith('L1_')) else 'HLT_' + _
-                         for _ in tdt_menu_item]
-        tdt_mapping[tdt_menu] = ','.join(tdt_menu_item)
-
-    if not getTriggerTranslatorToolSimple.printed:
-        for k, v in tdt_mapping.items():
-            tdt_local_logger.info('Category %s resolves to %s', k, v)
-        getTriggerTranslatorToolSimple.printed = True
-
-    monTrigTransTool = TriggerTranslatorToolSimple(
-        triggerMapping = tdt_mapping)
-    rv = ComponentAccumulator()
-    rv.setPrivateTools(monTrigTransTool)
-    return rv
-getTriggerTranslatorToolSimple.printed = False
diff --git a/Control/AthenaMonitoring/share/TrigDecTool_jobOptions.py b/Control/AthenaMonitoring/share/TrigDecTool_jobOptions.py
index 8bd6f46ac596..28945c555f06 100644
--- a/Control/AthenaMonitoring/share/TrigDecTool_jobOptions.py
+++ b/Control/AthenaMonitoring/share/TrigDecTool_jobOptions.py
@@ -21,32 +21,4 @@ if DQMonFlags.useTrigger():
    monTrigDecTool = conf2toConfigurable(tdtAcc.getPrimary())
    tdt_local_logger.info('Scheduled monitoring TDT %s', monTrigDecTool)
 
-   tdt_local_logger.info('Scheduling the trigger translator')
-   # Look up all monitoring menu lists, shove into trigger translator
-   # pass them in as joined strings, unpack in tool
-   from TrigHLTMonitoring.HLTMonTriggerList import hltmonList
-   import collections
-   tdt_mapping = {}
-   for tdt_menu, tdt_menu_item in hltmonList.__dict__.items():
-      if not isinstance(tdt_menu_item, collections.Iterable): continue
-      # work around possibly buggy category items
-      if isinstance(tdt_menu_item, str): 
-         tdt_local_logger.debug('String, not list: %s' % tdt_menu)
-         tdt_menu_item = [tdt_menu_item]
-      if len([_ for _ in tdt_menu_item if not (_.startswith('HLT_') or _.startswith('L1'))]) != 0:
-         tdt_local_logger.debug('Bad formatting: %s' % tdt_menu)
-      patched_names = []
-      tdt_menu_item = [_ if (_.startswith('HLT_') or _.startswith('L1_')) else 'HLT_' + _
-                       for _ in tdt_menu_item]
-      tdt_mapping[tdt_menu] = ','.join(tdt_menu_item)
-         
-   for k, v in tdt_mapping.items():
-      tdt_local_logger.info('Category %s resolves to %s' % (k, v))
-
-   from AthenaMonitoring.AthenaMonitoringConf import TriggerTranslatorToolSimple
-   monTrigTransTool = TriggerTranslatorToolSimple(
-      name = DQMonFlags.nameTrigTransTool(),
-      triggerMapping = tdt_mapping)
-   ToolSvc += monTrigTransTool
-
-del tdt_local_logger, tdt_mapping
+del tdt_local_logger
diff --git a/Control/AthenaMonitoring/src/AthMonitorAlgorithm.cxx b/Control/AthenaMonitoring/src/AthMonitorAlgorithm.cxx
index 9e4e937f82e6..81d3c65cf57d 100644
--- a/Control/AthenaMonitoring/src/AthMonitorAlgorithm.cxx
+++ b/Control/AthenaMonitoring/src/AthMonitorAlgorithm.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "AthenaMonitoring/AthMonitorAlgorithm.h"
@@ -36,19 +36,12 @@ StatusCode AthMonitorAlgorithm::initialize() {
         ATH_MSG_DEBUG( "TDT retrieved" );
 
         // If the trigger chain is specified, parse it into a list.
-        if ( m_triggerChainString!="" ) {
+        if ( !m_triggerChainString.empty() ) {
             sc = parseList(m_triggerChainString,m_vTrigChainNames);
             if ( !sc.isSuccess() ) {
                 ATH_MSG_WARNING("Error parsing trigger chain list, using empty list instead.");
                 m_vTrigChainNames.clear();
             }
-
-            // Then, retrieve the trigger translator if requested. Finally, convert 
-            // into a usable format using the unpackTriggerCategories function.
-            if (!m_trigTranslator.empty()) {
-                ATH_CHECK( m_trigTranslator.retrieve() );
-                unpackTriggerCategories(m_vTrigChainNames);
-            }
         }
     }
 
@@ -354,28 +347,3 @@ StatusCode AthMonitorAlgorithm::parseList(const std::string& line, std::vector<s
 
     return StatusCode::SUCCESS;
 }
-
-
-void AthMonitorAlgorithm::unpackTriggerCategories(std::vector<std::string>& vTrigChainNames) const {
-    for (size_t i = 0; i < vTrigChainNames.size(); ++i) {
-        std::string& thisName = vTrigChainNames[i];
-
-        if (thisName.compare(0,9, "CATEGORY_")==0) {
-            ATH_MSG_DEBUG("Found a trigger category: " << thisName << ". Unpacking.");
-            std::vector<std::string> triggers = m_trigTranslator->translate(thisName.substr(9,std::string::npos));
-            std::ostringstream oss;
-            oss << "(";
-            for (size_t itrig = 0; itrig < triggers.size(); ++itrig) {
-                if (itrig != 0) { 
-                    oss << "|";
-                }
-                oss << triggers[itrig];
-            }
-            oss << ")";
-            // replace with new value
-            std::string newval = oss.str();
-            ATH_MSG_DEBUG("Replaced with " << newval);
-            vTrigChainNames[i] = newval;
-        }
-    }
-}
-- 
GitLab