From 5e85572daafb19c2576596a2fa071f89fb44ad01 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 19 Jul 2023 18:06:45 +0200
Subject: [PATCH] TrigBphysMonitoring+TrigEgammaMonitoring: remove usage of
DQMonFlags
Replace legacy `DQMonFlags` with `flags.DQ.DataType` (ATR-27972).
---
.../python/TrigBphysMonitoringConfig.py | 14 +++++++-------
.../python/TrigEgammaMonitoringMTConfig.py | 19 ++++++++-----------
2 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
index 6e834ffc3cfa..8e8f306150e4 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
@@ -3,9 +3,8 @@
#
from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaMonitoring.DQConfigFlags import DQDataType
-if 'DQMonFlags' not in dir():
- from AthenaMonitoring.DQMonFlags import DQMonFlags as dqflags
class TrigBphysMonAlgBuilder:
@@ -91,17 +90,18 @@ class TrigBphysMonAlgBuilder:
def get_monitoring_mode(self):
self.__logger.info("TrigBphysMonToolBuilder.get_monitoring_mode()")
- self.data_type = dqflags.monManDataType()
- if self.data_type == 'monteCarlo':
+ self.data_type = self.helper.flags.DQ.DataType
+
+ if self.data_type is DQDataType.MC:
self.mc_mode = True
return True
- elif self.data_type == 'collisions':
+ elif self.data_type is DQDataType.Collisions:
self.pp_mode = True
return True
- elif self.data_type == 'heavyioncollisions':
+ elif self.data_type is DQDataType.HeavyIon:
self.hi_mode = True
return True
- elif self.data_type == 'cosmics':
+ elif self.data_type is DQDataType.Cosmics:
self.cosmic_mode = True
return True
else:
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
index a5f5e9f1612c..bb2762ad8cd1 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
@@ -12,13 +12,9 @@ import functools
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentFactory import CompFactory as CfgMgr
+from AthenaMonitoring.DQConfigFlags import DQDataType
-
-if 'DQMonFlags' not in dir():
- from AthenaMonitoring.DQMonFlags import DQMonFlags as dqflags
-
-#
def treat_list_of_chains_by_name( list_of_chains, part_name=None):
if part_name:
final_list = []
@@ -122,18 +118,19 @@ class TrigEgammaMonAlgBuilder:
def get_monitoring_mode(self):
self.__logger.info("TrigEgammaMonAlgBuilder.get_monitoring_mode()")
- self.data_type = dqflags.monManDataType()
- if self.data_type == 'monteCarlo':
+ self.data_type = self.helper.flags.DQ.DataType
+
+ if self.data_type is DQDataType.MC:
self.mc_mode = True
return True
- elif self.data_type == 'collisions':
+ elif self.data_type is DQDataType.Collisions:
self.pp_mode = True
return True
- elif self.data_type == 'heavyioncollisions':
+ elif self.data_type is DQDataType.HeavyIon:
self.HI_mode = True
self.pPb_mode = True
return True
- elif self.data_type == 'cosmics':
+ elif self.data_type is DQDataType.Cosmics:
self.cosmic_mode = True
return True
else:
@@ -1196,4 +1193,4 @@ class TrigEgammaMonAlgBuilder:
- return TrigEgammaInfo(trigger)
\ No newline at end of file
+ return TrigEgammaInfo(trigger)
--
GitLab