From 62a6601ed224287e36b899c9330ea6d0ae182de9 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 12 May 2021 13:33:24 +0200
Subject: [PATCH] TriggerMenuMT: add custom log formatter
Add a custom `logging` formatter for all child loggers in the
TriggerMenuMT package. Due to the deep module hierarchy, logger names
often become too long and make log file reading difficult. The custom
formatter now only shows the first and last module name, e.g.:
Py:TriggerMenuMT.HLTMenuConfig.UnconventionalTracking.FullScanLRTConfiguration
becomes
Py:TriggerMenuMT:FullScanLRTConfiguration
Also remove all custom logger names and use the module `__name__`
consistently.
---
.../Bjet/BjetChainConfiguration.py | 2 +-
.../Bjet/GenerateBjetChainDefs.py | 2 +-
.../Bphysics/BphysicsChainConfiguration.py | 2 +-
.../Bphysics/BphysicsMenuSequences.py | 2 +-
.../Bphysics/BphysicsRecoSequences.py | 2 +-
.../Bphysics/GenerateBphysicsChainDefs.py | 2 +-
.../BeamspotChainConfiguration.py | 2 +-
.../CalibCosmicMon/CalibChainConfiguration.py | 2 +-
.../CosmicChainConfiguration.py | 2 +-
.../EnhancedBiasChainConfiguration.py | 2 +-
.../GenerateBeamspotChainDefs.py | 2 +-
.../CalibCosmicMon/GenerateCalibChainDefs.py | 2 +-
.../CalibCosmicMon/GenerateCosmicChainDefs.py | 2 +-
.../GenerateEnhancedBiasChainDefs.py | 2 +-
.../GenerateMonitorChainDefs.py | 2 +-
.../GenerateStreamingChainDefs.py | 2 +-
.../MonitorChainConfiguration.py | 2 +-
.../StreamingChainConfiguration.py | 2 +-
.../Combined/GenerateCombinedChainDefs.py | 2 +-
.../CommonSequences/EventBuildingSequences.py | 2 +-
.../python/HLTMenuConfig/Egamma/EgammaDefs.py | 14 +++---
.../Egamma/ElectronChainConfiguration.py | 2 +-
.../Egamma/FastPhotonMenuSequences.py | 2 +-
.../Egamma/GenerateElectronChainDefs.py | 2 +-
.../Egamma/GeneratePhotonChainDefs.py | 2 +-
.../Egamma/PhotonChainConfiguration.py | 2 +-
.../Egamma/PrecisionCaloRecoSequences.py | 2 +-
.../Egamma/PrecisionPhotonMenuSequences.py | 2 +-
.../PrecisionElectronRecoSequences.py | 2 +-
.../PrecisionElectronRecoSequences_GSF.py | 2 +-
.../PrecisionElectronRecoSequences_LRT.py | 2 +-
.../Electron/PrecisionTrackSequences.py | 2 +-
.../Electron/PrecisionTrackSequences_LRT.py | 2 +-
.../Electron/TrigEMBremCollectionBuilder.py | 7 +--
.../Electron/TrigElectronFactories.py | 2 +-
.../HLTMenuConfig/Jet/GenerateJetChainDefs.py | 2 +-
.../Jet/JetChainConfiguration.py | 2 +-
.../HLTMenuConfig/Jet/JetRecoConfiguration.py | 2 +-
.../python/HLTMenuConfig/Jet/generateJet.py | 2 +-
.../HLTMenuConfig/MET/GenerateMETChainDefs.py | 2 +-
.../MET/METChainConfiguration.py | 2 +-
.../HLTMenuConfig/Menu/GenerateMenuMT.py | 46 +++++++++----------
.../Menu/GenerateMenuMT_newJO.py | 2 +-
.../HLTMenuConfig/Menu/HLTCFConfig_newJO.py | 4 +-
.../python/HLTMenuConfig/Menu/LS2_v1_newJO.py | 2 +-
.../Menu/PhysicsP1_pp_run3_v1.py | 2 +-
.../Muon/GenerateMuonChainDefs.py | 2 +-
.../Muon/MuonChainConfiguration.py | 2 +-
.../HLTMenuConfig/Muon/MuonMenuSequences.py | 2 +-
.../HLTMenuConfig/Muon/MuonRecoSequences.py | 2 +-
.../python/HLTMenuConfig/Muon/generateMuon.py | 2 +-
.../Photon/PhotonRecoSequences.py | 2 +-
.../HLTMenuConfig/Photon/generatePhoton.py | 2 +-
.../HLTMenuConfig/Tau/GenerateTauChainDefs.py | 2 +-
.../Tau/TauChainConfiguration.py | 2 +-
.../Test/GenerateTestChainDefs.py | 2 +-
.../Test/TestChainConfiguration.py | 2 +-
.../FullScanLRTTrackingConfiguration.py | 2 +-
...GenerateUnconventionalTrackingChainDefs.py | 2 +-
.../IsoHighPtTrackTriggerConfiguration.py | 2 +-
...nconventionalTrackingChainConfiguration.py | 2 +-
.../TriggerMenuMT/python/L1/Base/Boards.py | 2 +-
.../python/L1/Base/BunchGroupSet.py | 2 +-
.../TriggerMenuMT/python/L1/Base/CTP.py | 2 +-
.../python/L1/Base/CTPCondition.py | 2 +-
.../python/L1/Base/Connectors.py | 2 +-
.../TriggerMenuMT/python/L1/Base/Items.py | 2 +-
.../TriggerMenuMT/python/L1/Base/L1Menu.py | 2 +-
.../python/L1/Base/L1Menu2JSON.py | 2 +-
.../TriggerMenuMT/python/L1/Base/Limits.py | 2 +-
.../TriggerMenuMT/python/L1/Base/Logic.py | 2 +-
.../python/L1/Base/MenuConfObj.py | 2 +-
.../TriggerMenuMT/python/L1/Base/MenuUtils.py | 2 +-
.../python/L1/Base/MonCounters.py | 2 +-
.../python/L1/Base/PrescaleHelper.py | 2 +-
.../python/L1/Base/ThresholdType.py | 2 +-
.../python/L1/Base/Thresholds.py | 2 +-
.../python/L1/Base/TopoAlgorithms.py | 2 +-
.../TriggerMenuMT/python/L1/Base/TopoAlgos.py | 2 +-
.../python/L1/Config/CTPInputConfig.py | 2 +-
.../TriggerMenuMT/python/L1/Config/ItemDef.py | 2 +-
.../python/L1/Config/LegacyTopoMergerMap.py | 2 +-
.../python/L1/Config/MonitorDef.py | 2 +-
.../python/L1/Config/TopoAlgoDef.py | 2 +-
.../python/L1/Config/TopoAlgoDefLegacy.py | 2 +-
.../python/L1/Config/TopoAlgoDefMuctpi.py | 2 +-
.../L1/Config/TopoAlgoDefMultiplicity.py | 2 +-
.../python/L1/Config/TriggerTypeDef.py | 2 +-
.../L1/Config/TypeWideThresholdConfig.py | 2 +-
.../TriggerMenuMT/python/L1/L1MenuConfig.py | 2 +-
.../LVL1MenuConfig/L1Topo/L1TopoFlags.py | 2 +-
.../LVL1MenuConfig/L1Topo/L1TopoMenu.py | 2 +-
.../python/LVL1MenuConfig/L1Topo/TopoAlgos.py | 2 +-
.../LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py | 2 +-
.../LVL1MenuConfig/LVL1/BunchGroupSet.py | 2 +-
.../python/LVL1MenuConfig/LVL1/Cabling.py | 2 +-
.../python/LVL1MenuConfig/LVL1/Limits.py | 2 +-
.../python/LVL1MenuConfig/LVL1/Lvl1Flags.py | 2 +-
.../python/LVL1MenuConfig/LVL1/Lvl1Menu.py | 2 +-
.../LVL1MenuConfig/LVL1/Lvl1MenuItems.py | 2 +-
.../LVL1MenuConfig/LVL1/Lvl1MenuUtil.py | 2 +-
.../LVL1MenuConfig/LVL1/XMLMenuReader.py | 2 +-
.../python/LVL1MenuConfig/LVL1Menu/ItemDef.py | 2 +-
.../python/LVL1MenuConfig/LVL1Menu/L1Seeds.py | 2 +-
.../LVL1MenuConfig/LVL1Menu/MonitorDef.py | 2 +-
.../LVL1MenuConfig/TriggerConfigL1Topo.py | 2 +-
.../LVL1MenuConfig/TriggerConfigLVL1.py | 2 +-
.../python/TriggerAPI/SerializeAPI.py | 2 +-
.../python/TriggerAPI/TriggerAPI.py | 4 +-
.../python/TriggerAPI/TriggerDataAccess.py | 6 +--
.../python/TriggerAPI/TriggerEnums.py | 2 +-
.../python/TriggerAPI/TriggerInfo.py | 2 +-
.../python/TriggerAPI/TriggerPeriodData.py | 2 +-
.../TriggerMenuMT/python/__init__.py | 36 +++++++++++++++
114 files changed, 184 insertions(+), 147 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetChainConfiguration.py
index 79be0a019d3..e67075415eb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetChainConfiguration.py
@@ -2,7 +2,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Bjet.BjetChainConfiguration")
+log = logging.getLogger(__name__)
from ..Menu.ChainConfigurationBase import ChainConfigurationBase
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/GenerateBjetChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/GenerateBjetChainDefs.py
index f127e6eefe7..659dabee2cd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/GenerateBjetChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/GenerateBjetChainDefs.py
@@ -7,7 +7,7 @@ from ..Menu.ChainMerging import mergeChainDefs
import pprint
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Bjet.GenerateBjetChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsChainConfiguration.py
index b9912fde0ca..295261b4bdf 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsChainConfiguration.py
@@ -7,7 +7,7 @@
#########################################################################
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Bphysics.BphysicsChainConfiguration")
+log = logging.getLogger(__name__)
from ..Menu.ChainConfigurationBase import ChainConfigurationBase
from ..Muon.MuonChainConfiguration import MuonChainConfiguration
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsMenuSequences.py
index edb093fa95d..c0c89bbc3e9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsMenuSequences.py
@@ -5,7 +5,7 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaCommon.CFElements import seqAND
from TrigEDMConfig.TriggerEDMRun3 import recordable
from AthenaCommon.Logging import logging
-log = logging.getLogger('BphysicsMenuSequence')
+log = logging.getLogger(__name__)
def bmumuxAlgSequence(ConfigFlags):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsRecoSequences.py
index 8ff3476d02e..b7b2b19ff11 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsRecoSequences.py
@@ -3,7 +3,7 @@
from AthenaCommon.GlobalFlags import globalflags
from AthenaCommon.CFElements import seqAND, parOR
from AthenaCommon.Logging import logging
-log = logging.getLogger('BphysicsRecoSequences')
+log = logging.getLogger(__name__)
def bmumuxRecoSequence(rois, muons):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/GenerateBphysicsChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/GenerateBphysicsChainDefs.py
index 735b483856d..a8825b4f105 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/GenerateBphysicsChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/GenerateBphysicsChainDefs.py
@@ -5,7 +5,7 @@
###########################################################################
from AthenaCommon.Logging import logging
-log = logging.getLogger('TriggerMenuMT.HLTMenuConfig.Bphysics.generateChainConfigs')
+log = logging.getLogger(__name__)
logging.getLogger().info('Importing %s', __name__)
from ..Menu.ChainDictTools import splitChainDict
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
index ede1b85b91a..b50303aecdf 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
@@ -2,7 +2,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.BeamspotChainConfiguration")
+log = logging.getLogger(__name__)
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
from TrigStreamerHypo.TrigStreamerHypoConfigMT import StreamerHypoToolMTgenerator
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CalibChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CalibChainConfiguration.py
index 5ec5bc8fbc5..2e64c1f6e1c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CalibChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CalibChainConfiguration.py
@@ -2,7 +2,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.CalibChainConfiguration")
+log = logging.getLogger(__name__)
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CosmicChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CosmicChainConfiguration.py
index 5adfbcbd6d2..57894a329df 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CosmicChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/CosmicChainConfiguration.py
@@ -2,7 +2,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.CosmicChainConfiguration")
+log = logging.getLogger(__name__)
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/EnhancedBiasChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/EnhancedBiasChainConfiguration.py
index f63dbcdc81f..7406176dd71 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/EnhancedBiasChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/EnhancedBiasChainConfiguration.py
@@ -9,7 +9,7 @@ from AthenaCommon.CFElements import seqAND
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.EnhancedBiasDef")
+log = logging.getLogger(__name__)
# Low threshold prescaled L1 items - slected at HLT based on TBP bit from L1 in random-seeded events
# High(er) threshold prescaled L1 items - slected at HLT based on TBP bit from L1 in random-seeded events
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateBeamspotChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateBeamspotChainDefs.py
index 6af9e6d6543..9281e22ab36 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateBeamspotChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateBeamspotChainDefs.py
@@ -6,7 +6,7 @@ from .BeamspotChainConfiguration import BeamspotChainConfiguration
import pprint
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCalibChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCalibChainDefs.py
index 3135a2310ea..705e20285fb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCalibChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCalibChainDefs.py
@@ -6,7 +6,7 @@ from .CalibChainConfiguration import CalibChainConfiguration
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCosmicChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCosmicChainDefs.py
index 74bd4cfa0bb..1d060960ff8 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCosmicChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateCosmicChainDefs.py
@@ -6,7 +6,7 @@ from .CosmicChainConfiguration import CosmicChainConfiguration
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateEnhancedBiasChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateEnhancedBiasChainDefs.py
index a7e8521b5b1..10915141ebf 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateEnhancedBiasChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateEnhancedBiasChainDefs.py
@@ -5,7 +5,7 @@ from ..Menu.ChainMerging import mergeChainDefs
from .EnhancedBiasChainConfiguration import EnhancedBiasChainConfiguration
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py
index aeacfabd9df..e3ef12d58df 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateMonitorChainDefs.py
@@ -6,7 +6,7 @@ from ..Menu.ChainMerging import mergeChainDefs
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateStreamingChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateStreamingChainDefs.py
index 84673850a1c..eb0d22a2229 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateStreamingChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateStreamingChainDefs.py
@@ -6,7 +6,7 @@ from .StreamingChainConfiguration import StreamingChainConfiguration
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py
index dd9e0df7e2c..d2369c46bc1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py
@@ -2,7 +2,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.MonitorChainConfiguration")
+log = logging.getLogger(__name__)
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/StreamingChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/StreamingChainConfiguration.py
index e7f587269df..50729035041 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/StreamingChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/StreamingChainConfiguration.py
@@ -2,7 +2,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.StreamingChainConfiguration")
+log = logging.getLogger(__name__)
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
from TrigStreamerHypo.TrigStreamerHypoConfigMT import StreamerHypoToolMTgenerator
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Combined/GenerateCombinedChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Combined/GenerateCombinedChainDefs.py
index 4097e32800c..a4f164ce194 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Combined/GenerateCombinedChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Combined/GenerateCombinedChainDefs.py
@@ -5,7 +5,7 @@
############################################################
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Combined' )
+log = logging.getLogger(__name__)
logging.getLogger().info("Importing %s",__name__)
def addTopoInfo(theChainConfig, chainDict, listOfChainDefs, lengthOfChainConfigs):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py
index 1cc616bacc9..4e1ea0e78f5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py
@@ -11,7 +11,7 @@ from DecisionHandling import DecisionHandlingConf
from libpyeformat_helper import SourceIdentifier, SubDetector
from AthenaCommon.CFElements import seqAND, findAlgorithm
from AthenaCommon.Logging import logging
-log = logging.getLogger('EventBuildingSequenceSetup')
+log = logging.getLogger(__name__)
def addEventBuildingSequence(chain, eventBuildType, chainDict):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py
index ecc9f1849bc..9a4700063c9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/EgammaDefs.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
#----------------------------------------------------------------
# Static classes to configure photon chain container names
@@ -10,7 +10,7 @@ from AthenaCommon import CfgMgr
from ROOT import egammaPID
from ElectronPhotonSelectorTools.ConfiguredAsgPhotonIsEMSelectors import ConfiguredAsgPhotonIsEMSelector
-mlog = logging.getLogger ('EgammaDefs')
+log = logging.getLogger(__name__)
class TrigEgammaKeys(object):
"""Static class to collect all string manipulation in Electron sequences """
@@ -61,7 +61,7 @@ def createTrigEgammaPrecisionElectronDNNSelectors(ConfigFilePath=None):
})
selectors = []
- mlog.debug('Configuring electron DNN' )
+ log.debug('Configuring electron DNN' )
for dnnname, name in SelectorNames.items():
SelectorTool = CfgMgr.AsgElectronSelectorTool(name)
SelectorTool.ConfigFile = ConfigFilePath + '/' + ElectronToolConfigFile[dnnname]
@@ -96,7 +96,7 @@ def createTrigEgammaPrecisionElectronLHSelectors(ConfigFilePath=None):
})
selectors = []
- mlog.debug('Configuring electron PID' )
+ log.debug('Configuring electron PID' )
for pidname, name in SelectorNames.items():
SelectorTool = CfgMgr.AsgElectronLikelihoodTool(name)
SelectorTool.ConfigFile = ConfigFilePath + '/' + ElectronToolConfigFile[pidname]
@@ -194,10 +194,10 @@ def createTrigEgammaPrecisionPhotonSelectors(ConfigFilePath=None):
selectors = []
for sel, name in SelectorNames.items():
- mlog.debug('Configuring photon PID for %s', sel)
+ log.debug('Configuring photon PID for %s', sel)
SelectorTool = ConfiguredAsgPhotonIsEMSelector(name, SelectorPID[sel])
ConfigFile = ConfigFilePath + '/' + PhotonToolConfigFile[sel]
- mlog.debug('Configuration file: %s', ConfigFile)
+ log.debug('Configuration file: %s', ConfigFile)
SelectorTool.ConfigFile = ConfigFile
SelectorTool.ForceConvertedPhotonPID = True
SelectorTool.isEMMask = PhotonIsEMBits[sel]
@@ -219,7 +219,7 @@ def createTrigEgammaFastCaloSelectors(doPhotons=False, ConfigFilePath='RingerSel
# add ONNX into app service mgr
ServiceMgr += AthONNX__ONNXRuntimeSvc()
from AthenaCommon.Logging import logging
- log = logging.getLogger('TrigEgammaFastCaloSelectors')
+ log = logging.getLogger(__name__)
SelectorNames = collections.OrderedDict( {
"Electrons": collections.OrderedDict({
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronChainConfiguration.py
index 8a3ec78169f..e092aae9977 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronChainConfiguration.py
@@ -3,7 +3,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Egamma.ElectronChainConfiguration")
+log = logging.getLogger(__name__)
from ..Menu.ChainConfigurationBase import ChainConfigurationBase
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/FastPhotonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/FastPhotonMenuSequences.py
index f9aa88521d9..f361355fe36 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/FastPhotonMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/FastPhotonMenuSequences.py
@@ -10,7 +10,7 @@ from TrigEDMConfig.TriggerEDMRun3 import recordable
# logger
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Egamma.PhotonMenuSequences' )
+log = logging.getLogger(__name__)
def fastPhotonMenuSequence():
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py
index b42971c1e10..3ee7ad3cd78 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py
@@ -6,7 +6,7 @@ from ..Menu.ChainMerging import mergeChainDefs
import pprint
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Egamma.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GeneratePhotonChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GeneratePhotonChainDefs.py
index 16e1e088497..ebeb2164945 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GeneratePhotonChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GeneratePhotonChainDefs.py
@@ -6,7 +6,7 @@ from .PhotonChainConfiguration import PhotonChainConfiguration
import pprint
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Egamma.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonChainConfiguration.py
index 3025f10a471..6aa6fb2e3b5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonChainConfiguration.py
@@ -4,7 +4,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Egamma.PhotonDef")
+log = logging.getLogger(__name__)
from ..Menu.ChainConfigurationBase import ChainConfigurationBase
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloRecoSequences.py
index 753a451e90f..8de6a7d3c6d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloRecoSequences.py
@@ -10,7 +10,7 @@ from .PrecisionCaloMenuSequences_LRT import precisionCaloMenuDefs_LRT
from .PrecisionCaloMenuSequences_FWD import precisionCaloMenuDefs_FWD
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloRec' )
+log = logging.getLogger(__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionPhotonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionPhotonMenuSequences.py
index 0626ad43171..864fc4e934f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionPhotonMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionPhotonMenuSequences.py
@@ -8,7 +8,7 @@ from DecisionHandling.DecisionHandlingConf import ViewCreatorPreviousROITool
# logger
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionPhotonMenuSequences' )
+log = logging.getLogger(__name__)
def precisionPhotonSequence(ConfigFlags):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
index 3f70b992f79..44b4984854f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
@@ -6,7 +6,7 @@ from AthenaCommon.CFElements import parOR
#logging
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionElectronRecoSequences')
+log = logging.getLogger(__name__)
def precisionElectronRecoSequence(RoIs):
""" With this function we will setup the sequence of offline EgammaAlgorithms so to make a electron for TrigEgamma
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_GSF.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_GSF.py
index 989b904c5b9..cecec03a0ae 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_GSF.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_GSF.py
@@ -6,7 +6,7 @@ from AthenaCommon.CFElements import parOR
#logging
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionElectronRecoSequences_GSF')
+log = logging.getLogger(__name__)
def precisionElectronRecoSequence_GSF(RoIs):
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_LRT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_LRT.py
index c01395b02be..cab18e65f32 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_LRT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_LRT.py
@@ -6,7 +6,7 @@ from AthenaCommon.CFElements import parOR
#logging
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionElectronRecoSequences_LRT')
+log = logging.getLogger(__name__)
def precisionElectronRecoSequence_LRT(RoIs):
""" With this function we will setup the sequence of offline EgammaAlgorithms so to make a electron for TrigEgamma
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionTrackSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionTrackSequences.py
index 6d3049f27d8..cefd34224ce 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionTrackSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionTrackSequences.py
@@ -8,7 +8,7 @@ import AthenaCommon.CfgMgr as CfgMgr
#logging
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionTracking')
+log = logging.getLogger(__name__)
#from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup import precisionCaloMenuDefs
from TriggerMenuMT.HLTMenuConfig.Egamma.EgammaDefs import TrigEgammaKeys
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionTrackSequences_LRT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionTrackSequences_LRT.py
index 1bb26e663e6..56ca9cc5ce9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionTrackSequences_LRT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionTrackSequences_LRT.py
@@ -8,7 +8,7 @@ import AthenaCommon.CfgMgr as CfgMgr
#logging
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionTracking_LRT')
+log = logging.getLogger(__name__)
#from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup_LRT import precisionCaloMenuDefs_LRT
from TriggerMenuMT.HLTMenuConfig.Egamma.EgammaDefs import TrigEgammaKeys_LRT
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py
index 5f7acd2492c..96977bf0e89 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
__doc__ = """ToolFactory to instantiate TrigEMBremCollectionBuilder
with default configuration"""
@@ -16,12 +16,13 @@ from InDetRecExample.InDetJobProperties import InDetFlags
from RecExConfig.RecFlags import rec
from TriggerMenuMT.HLTMenuConfig.Egamma.EgammaDefs import TrigEgammaKeys_GSF
+log = logging.getLogger(__name__)
+
class TrigEgammaBremCollectionBuilder (egammaAlgsConf.EMBremCollectionBuilder):
__slots__ = ()
def __init__(self, name="TrigEgammaBremCollectionBuilder", **kw):
- mlog = logging.getLogger(name + '::__init__')
- mlog.info("entering")
+ log.debug("entering")
super(TrigEgammaBremCollectionBuilder, self).__init__(name, **kw)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigElectronFactories.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigElectronFactories.py
index 495e90915de..e3b8e5fd847 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigElectronFactories.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigElectronFactories.py
@@ -54,7 +54,7 @@ def TrigTopoEgammaElectronCfg(name='topoEgammaBuilder_TrigElectrons'):
defineHistogram('EldeltaPhi',type='TH1F', title='#Delta#phi', path='EXPERT',xbins=80, xmin=-0.01, xmax=0.01),
defineHistogram('EleT', type='TH1F', title='p#_{T} [GeV]', path='EXPERT',xbins=80, xmin=0., xmax=100)]
- mlog = logging.getLogger("TrigElectronFactories")
+ mlog = logging.getLogger(__name__)
mlog.info('Starting configuration')
TrigTopoEgammaElectron = AlgFactory( egammaAlgsConf.topoEgammaBuilder, name = name,
SuperElectronRecCollectionName = TrigEgammaKeys.SuperElectronRecCollectionName,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/GenerateJetChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/GenerateJetChainDefs.py
index c26e33e1147..df41ab201b9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/GenerateJetChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/GenerateJetChainDefs.py
@@ -4,7 +4,7 @@ from .JetChainConfiguration import JetChainConfiguration
import pprint
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Jet.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
index 7666d3db609..eace8e5aa41 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
@@ -2,7 +2,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Jet.JetChainConfiguration")
+log = logging.getLogger(__name__)
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, RecoFragmentsPool
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
index 22f401f2b5f..3c972449e63 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
@@ -12,7 +12,7 @@ from JetRecConfig.JetDefinition import JetConstitSeq,JetConstitSource, xAODType,
from .TriggerJetMods import jetmoddict # noqa: F401
from AthenaCommon.Logging import logging
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Jet.JetRecoConfiguration")
+log = logging.getLogger(__name__)
def interpretJetCalibDefault(recoDict):
if recoDict['recoAlg'] == 'a4':
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py
index 77e5fb66e5f..ce26d1eec53 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py
@@ -6,7 +6,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
import pprint
from AthenaCommon.Logging import logging
from ..CommonSequences.FullScanDefs import caloFSRoI
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Jet.generateJet' )
+log = logging.getLogger(__name__)
def HLTCaloCellMakerCfg( flags, cellsname, cdaSvc ):
result = ComponentAccumulator()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/GenerateMETChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/GenerateMETChainDefs.py
index 94346f18230..7d1837ecf0e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/GenerateMETChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/GenerateMETChainDefs.py
@@ -6,7 +6,7 @@ from .METChainConfiguration import METChainConfiguration
import pprint
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.MET.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METChainConfiguration.py
index c9f414318a3..a51660e210a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METChainConfiguration.py
@@ -3,7 +3,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s", __name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.MET.METChainConfiguration")
+log = logging.getLogger(__name__)
from ..Menu.ChainConfigurationBase import ChainConfigurationBase
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
index 43afb4537e5..bc291b8de7f 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
@@ -19,7 +19,7 @@ from .MenuAlignmentTools import MenuAlignment
from ..CommonSequences import EventBuildingSequences
from AthenaCommon.Logging import logging
-log = logging.getLogger( __name__ )
+log = logging.getLogger(__name__)
_func_to_modify_signatures = None
@@ -108,7 +108,7 @@ class GenerateMenuMT(object, metaclass=Singleton):
(self.L1Prescales, self.HLTPrescales) = MenuPrescaleConfig(TriggerConfigHLT)
global _func_to_modify_signatures
if _func_to_modify_signatures is not None:
- log.info('[setupMenu] Modifying trigger signatures in TriggerFlags with %s',
+ log.info('Modifying trigger signatures in TriggerFlags with %s',
_func_to_modify_signatures.__name__)
_func_to_modify_signatures()
self.signaturesOverwritten = True
@@ -157,7 +157,7 @@ class GenerateMenuMT(object, metaclass=Singleton):
def importSignaturesToGenerate(self):
# check if all the signature files can be imported files can be imported
# and then import them!
- log.debug("[getSignaturesInMenu] signaturesToGenerate: %s", self.signaturesToGenerate)
+ log.debug("[getSignaturesInMenu]signaturesToGenerate: %s", self.signaturesToGenerate)
extendedSignatureToGenerate = self.signaturesToGenerate+['Streaming'] # always import the Streaming sig because noalg chains are moved to StreamingSlice
@@ -206,12 +206,12 @@ class GenerateMenuMT(object, metaclass=Singleton):
current_sig = chainDict['signatures'][0]
if current_sig != previous_sig:
previous_sig = current_sig
- log.info("[generateChains] Now starting generation of signature %s",current_sig)
+ log.info("Now starting generation of signature %s",current_sig)
elif len(set(chainDict['signatures'])) > 1:
current_sig = 'Combined'
if current_sig != previous_sig:
previous_sig = current_sig
- log.info("[generateChains] Now starting generation of signature %s",current_sig)
+ log.info("Now starting generation of signature %s",current_sig)
log.debug("Next: getting chain configuration for chain %s ", chainDict['chainName'])
chainConfig,lengthOfChainConfigs = self.__generateChainConfig(chainDict)
@@ -248,22 +248,22 @@ class GenerateMenuMT(object, metaclass=Singleton):
"""
# get all chain names from menu
- log.info("[generateAllChainConfigs] will now get chains from the menu")
+ log.info("Will now get chains from the menu")
self.getChainsFromMenu()
# decoding of the chain name
- log.info("[generateAllChainConfigs] will now get chain dictionaries for each chain")
+ log.info("Will now get chain dictionaries for each chain")
self.getChainDicts()
#import the necessary signatures
- log.info("[generateAllChainConfigs] importing the necessary signatures")
+ log.info("Importing the necessary signatures")
self.importSignaturesToGenerate()
- log.info("[generateAllChainConfigs] will now generate the chain configuration for each chain")
+ log.info("Will now generate the chain configuration for each chain")
self.generateChains()
- log.info("[generateAllChainConfigs] will now calculate the alignment parameters")
+ log.info("Will now calculate the alignment parameters")
#dict of signature: set it belongs to
#e.g. {'Electron': ['Electron','Muon','Photon']}
menuAlignment = MenuAlignment(self.combinationsInMenu,
@@ -276,7 +276,7 @@ class GenerateMenuMT(object, metaclass=Singleton):
# combinationsInMenu = menuAlignment.combinationsInMenu
# alignmentGroup_sets_to_align = menuAlignment.setsToAlign
- log.info('[generateAllChainConfigs] Aligning the following signatures: %s',sorted(menuAlignment.sets_to_align))
+ log.info('Aligning the following signatures: %s',sorted(menuAlignment.sets_to_align))
log.debug('Length of each of the alignment groups: %s',self.configLengthDict)
@@ -350,7 +350,7 @@ class GenerateMenuMT(object, metaclass=Singleton):
elif not eval('self.do' + sig + 'Chains'):
log.debug('Signature %s is not switched on (disabled by flag)', sig)
- log.info("[getChainsFromMenu] The following signature(s) is(are) enabled: %s", self.signaturesToGenerate)
+ log.info("The following signature(s) is(are) enabled: %s", self.signaturesToGenerate)
if self.selectChainsForTesting:
log.info("Narrowing down the list of chains with the selectChainsForTesting list")
@@ -358,7 +358,7 @@ class GenerateMenuMT(object, metaclass=Singleton):
if len(selectedChains) < len(self.selectChainsForTesting):
selectedNames = [ch.name for ch in selectedChains]
missingNames = [name for name in self.selectChainsForTesting if name not in selectedNames]
- log.error("[getChainsFromMenu] The following chains were specified in selectChainsForTesting but were not found in the menu: %s", str(missingNames))
+ log.error("The following chains were specified in selectChainsForTesting but were not found in the menu: %s", str(missingNames))
raise Exception("[getChainsFromMenu] Cannot test one or more requested chains, exiting.")
chains = selectedChains
@@ -487,7 +487,7 @@ class GenerateMenuMT(object, metaclass=Singleton):
if not the_step.isEmpty:
steps_are_empty[istep] = False
- log.info("[resolveEmptySteps] Are there any fully empty steps? %s", steps_are_empty)
+ log.info("Are there any fully empty steps? %s", steps_are_empty)
empty_step_indices = [i for i,is_empty in enumerate(steps_are_empty) if is_empty]
@@ -500,7 +500,7 @@ class GenerateMenuMT(object, metaclass=Singleton):
log.error("[resolveEmptySteps] The menu you are trying to generate contains a fully empty step. This is only allowed for partial menus.")
raise Exception("[resolveEmptySteps] Please find the source of this empty step and remove it from the menu.")
- log.info("[resolveEmptySteps] I will now delete steps %s (indexed from zero)",empty_step_indices)
+ log.info("Will now delete steps %s (indexed from zero)",empty_step_indices)
for cc in chainConfigs:
new_steps = []
@@ -517,7 +517,7 @@ class GenerateMenuMT(object, metaclass=Singleton):
"""
== Main function of the class which generates L1, L1Topo and HLT menu
"""
- log.info('[generateMT] starting menu generation')
+ log.info('Starting menu generation')
# --------------------------------------------------------------------
# L1 menu generation
@@ -531,7 +531,7 @@ class GenerateMenuMT(object, metaclass=Singleton):
# HLT menu generation
# --------------------------------------------------------------------
finalListOfChainConfigs = self.generateAllChainConfigs()
- log.info("[generateMT] Length of FinalListofChainConfigs %s", len(finalListOfChainConfigs))
+ log.info("Length of FinalListofChainConfigs %s", len(finalListOfChainConfigs))
# make sure that we didn't generate any steps that are fully empty in all chains
# if there are empty steps, remove them
@@ -541,30 +541,30 @@ class GenerateMenuMT(object, metaclass=Singleton):
for cc in finalListOfChainConfigs:
log.debug('Steps for %s are %s', cc.name, cc.steps)
- log.info("[generateMT] will now make the HLT configuration tree")
+ log.info("Making the HLT configuration tree")
makeHLTTree(newJO=False, triggerConfigHLT = TriggerConfigHLT)
# the return values used for debugging, might be removed later
- log.info("[generateMT] will now apply HLT prescales")
+ log.info("Applying HLT prescales")
# Having built the Menu add prescales for disabling items (e.g. MC production)
applyHLTPrescale(TriggerConfigHLT, self.HLTPrescales, self.signaturesOverwritten)
- log.info("[generateMT] now generating HLT menu JSON...")
+ log.info("Generating HLT menu JSON...")
from TriggerMenuMT.HLTMenuConfig.Menu.HLTMenuJSON import generateJSON
generateJSON()
- log.info("[generateMT] now generating HLT prescale JSON...")
+ log.info("Generating HLT prescale JSON...")
from TriggerMenuMT.HLTMenuConfig.Menu.HLTPrescaleJSON import generateJSON as generatePrescaleJSON
generatePrescaleJSON()
- log.info('[generateMT] now generating HLTMonitoring JSON...')
+ log.info('Generating HLTMonitoring JSON...')
from TriggerMenuMT.HLTMenuConfig.Menu.HLTMonitoringJSON import generateDefaultMonitoringJSON
generateDefaultMonitoringJSON()
- log.info('[generateMT] Menu generation is complete.')
+ log.info('Menu generation is complete.')
return finalListOfChainConfigs
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
index 93f836f285e..8f002cc74d3 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT_newJO.py
@@ -10,7 +10,7 @@ from .MenuAlignmentTools import MenuAlignment
import importlib
from AthenaCommon.Logging import logging
-log = logging.getLogger( "GenerateMenuMT_newJO" )
+log = logging.getLogger(__name__)
def getChainsOfMenu(flags):
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
index ea238beb1b2..bc2e56b740c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from functools import lru_cache
from AthenaCommon.CFElements import findAllAlgorithms, parOR, seqOR, seqAND, isSequence
from AthenaCommon.Logging import logging
@@ -14,7 +14,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import (isComboHypoAlg,
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming
from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
-log = logging.getLogger( __name__.split(".")[-1] )
+log = logging.getLogger( __name__ )
def resetDF(acc):
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
index a363662eba1..9aec5989e3b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
@@ -105,7 +105,7 @@ if __name__ == "__main__":
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaCommon.Logging import logging
- log = logging.getLogger('ComponentAccumulator')
+ log = logging.getLogger(__name__)
acc = ComponentAccumulator()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py
index addfb406684..e00e9f86312 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py
@@ -196,7 +196,7 @@ def addP1Signatures():
def setupMenu():
from AthenaCommon.Logging import logging
- log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Menu.PhysicsP1_pp_run3_v1.py' )
+ log = logging.getLogger(__name__)
log.info('setupMenu ...')
physics_menu.setupMenu()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/GenerateMuonChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/GenerateMuonChainDefs.py
index 763f3e34cc0..7518a92ec4b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/GenerateMuonChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/GenerateMuonChainDefs.py
@@ -5,7 +5,7 @@
###########################################################################
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Muon.generateChainConfigs' )
+log = logging.getLogger(__name__)
logging.getLogger().info("Importing %s",__name__)
from ..Menu.ChainDictTools import splitChainDict
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonChainConfiguration.py
index d7e5e227f3d..38e69faed62 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonChainConfiguration.py
@@ -7,7 +7,7 @@
#########################################################################
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Muon.MuonChainConfiguration")
+log = logging.getLogger(__name__)
from ..Menu.ChainConfigurationBase import ChainConfigurationBase
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonMenuSequences.py
index 5578c3bb651..f25b6545daf 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonMenuSequences.py
@@ -6,7 +6,7 @@ from ..Menu.MenuComponents import MenuSequence, RecoFragmentsPool
from AthenaCommon.CFElements import parOR, seqAND, seqOR
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaCommon.Logging import logging
-log = logging.getLogger('MuonMenuSequences')
+log = logging.getLogger(__name__)
#-----------------------------------------------------#
### Used the algorithms as Step1 "muFast step" ###
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonRecoSequences.py
index 9b5c28d53e4..d8ece61a498 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonRecoSequences.py
@@ -6,7 +6,7 @@ from AthenaCommon.Logging import logging
from AthenaCommon.GlobalFlags import globalflags
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-log = logging.getLogger('MuonRecoSequences')
+log = logging.getLogger(__name__)
### Output data name ###
from TrigEDMConfig.TriggerEDMRun3 import recordable
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
index 41a3a7dbdf0..7e5354c332e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
@@ -37,7 +37,7 @@ from TrigInDetConfig.ConfigSettings import getInDetTrigConfig
import pprint
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Muon.generateMuon' )
+log = logging.getLogger(__name__)
def fakeHypoAlgCfg(flags, name="FakeHypoForMuon"):
HLTTest__TestHypoAlg=CompFactory.HLTTest.TestHypoAlg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py
index 4fc3b8b97a4..27b69c1fd99 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py
@@ -6,7 +6,7 @@ from AthenaCommon.CFElements import parOR
#logging
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Photon.PhotonRecoSequences' )
+log = logging.getLogger(__name__)
def precisionPhotonRecoSequence(RoIs):
""" With this function we will setup the sequence of offline EgammaAlgorithms so to make a photon for TrigEgamma
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
index 78e8d3d6bca..ccc142f0af4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py
@@ -10,7 +10,7 @@ from TrigEgammaHypo.TrigEgammaFastPhotonHypoTool import TrigEgammaFastPhotonHypo
import pprint
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Photon.generatePhoton' )
+log = logging.getLogger(__name__)
# TODO reuse electron calo setup (these two could share all algorithms)
def _fastCalo(flags, chainDict):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/GenerateTauChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/GenerateTauChainDefs.py
index 11ae0280ca2..6da7eef0dd3 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/GenerateTauChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/GenerateTauChainDefs.py
@@ -5,7 +5,7 @@
###########################################################################
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Tau.generateChainConfigs' )
+log = logging.getLogger(__name__)
logging.getLogger().info("Importing %s",__name__)
from ..Menu.ChainDictTools import splitChainDict
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
index cd6a1eee489..5967fefc685 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauChainConfiguration.py
@@ -7,7 +7,7 @@
#########################################################################
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Tau.TauChainConfiguration")
+log = logging.getLogger(__name__)
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/GenerateTestChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/GenerateTestChainDefs.py
index 5d47cfad826..c04aa64e70e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/GenerateTestChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/GenerateTestChainDefs.py
@@ -5,7 +5,7 @@ from ..Menu.ChainMerging import mergeChainDefs
from .TestChainConfiguration import TestChainConfiguration
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Test.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestChainConfiguration.py
index 15030c0af13..19675579d6d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestChainConfiguration.py
@@ -2,7 +2,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Test.TestChainConfiguration")
+log = logging.getLogger(__name__)
from ..Menu.ChainConfigurationBase import ChainConfigurationBase
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
index f51ba7ff4e8..ec6088a12b3 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
@@ -5,7 +5,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFr
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.UnconventionalTracking.FullScanLRTConfiguration")
+log = logging.getLogger(__name__)
def FullScanLRTTriggerSequence(ConfigFlags):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/GenerateUnconventionalTrackingChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/GenerateUnconventionalTrackingChainDefs.py
index 4a35fa64dd9..518688f11f7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/GenerateUnconventionalTrackingChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/GenerateUnconventionalTrackingChainDefs.py
@@ -4,7 +4,7 @@ from .UnconventionalTrackingChainConfiguration import UnconventionalTrackingChai
import pprint
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.UnconventionalTracking.generateChainConfigs' )
+log = logging.getLogger(__name__)
log.info("Importing %s",__name__)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py
index 9b23fd6cf91..45439b71c0f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/IsoHighPtTrackTriggerConfiguration.py
@@ -5,7 +5,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFr
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.IsoHighPtTrackTriggerConfiguration")
+log = logging.getLogger(__name__)
def FTFTrackSequence(ConfigFlags):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py
index 6bf0ddf7d85..92742ff9ea1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/UnconventionalTrackingChainConfiguration.py
@@ -2,7 +2,7 @@
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
-log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.UnconventionalTracking.UnconventionalTrackingChainConfiguration")
+log = logging.getLogger(__name__)
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Boards.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Boards.py
index 5fcc5071ece..3c82978fa43 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Boards.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Boards.py
@@ -6,7 +6,7 @@ from enum import Enum
from collections import OrderedDict as odict
from AthenaCommon.Logging import logging
-log = logging.getLogger("Menu.L1.Base.Boards")
+log = logging.getLogger(__name__)
class BoardType(Enum):
NONE = 1
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/BunchGroupSet.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/BunchGroupSet.py
index 8e15366f391..0ce88d5e850 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/BunchGroupSet.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/BunchGroupSet.py
@@ -9,7 +9,7 @@ from .Limits import Limits
from .L1MenuFlags import L1MenuFlags
-log = logging.getLogger("Menu.L1.Base.BunchGroupSet")
+log = logging.getLogger(__name__)
def createDefaultBunchGroupSetMC():
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/CTP.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/CTP.py
index 96710ea05db..c9a9a49acc8 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/CTP.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/CTP.py
@@ -3,7 +3,7 @@
from collections import OrderedDict as odict
from AthenaCommon.Logging import logging
-log = logging.getLogger("Menu.L1.Base.CTP")
+log = logging.getLogger(__name__)
from ..Config.MonitorDef import MonitorDef
from ..Config.CTPInputConfig import CTPInputConfig
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/CTPCondition.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/CTPCondition.py
index 7cae0a54d24..2b86715508c 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/CTPCondition.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/CTPCondition.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
-log = logging.getLogger("Menu.L1.Base.CTPCondition")
+log = logging.getLogger(__name__)
from .Logic import Logic, LogicType
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Connectors.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Connectors.py
index cb7713fdf42..eb022c5b2bd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Connectors.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Connectors.py
@@ -8,7 +8,7 @@ from AthenaCommon.Logging import logging
from .TopoAlgorithms import AlgCategory
-log = logging.getLogger("Menu.L1.Base.Connectors")
+log = logging.getLogger(__name__)
class CType(Enum):
CTPIN = (1, 'ctpin')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py
index 7544eff4321..ed5762cc3a7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py
@@ -11,7 +11,7 @@ from .MenuUtils import binstr
from past.builtins import cmp
-log = logging.getLogger("Menu.L1.Base.Items")
+log = logging.getLogger(__name__)
class MenuItemsCollection(object):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu.py
index ca4decbb773..a92d61ea873 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu.py
@@ -10,7 +10,7 @@ from .MenuUtils import get_smk_psk_Name
from .Limits import Limits
from AthenaCommon.Logging import logging
-log = logging.getLogger("Menu.L1.Base.L1Menu")
+log = logging.getLogger(__name__)
class L1Menu(object):
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu2JSON.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu2JSON.py
index aa4e7d70587..bcf5587d2bb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu2JSON.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu2JSON.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
-log = logging.getLogger("Menu.L1.Base.L1Menu2JSON")
+log = logging.getLogger(__name__)
class L1MenuJSONConverter(object):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Limits.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Limits.py
index d0abc68da3a..82e2444415c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Limits.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Limits.py
@@ -5,7 +5,7 @@ This temporarily holds CTP sizes
"""
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Base.Limits')
+log = logging.getLogger(__name__)
class Access(type):
"""Metaclass to implement __getattr__ for class variables"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Logic.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Logic.py
index 20bec182a3b..22c8744a76b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Logic.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Logic.py
@@ -6,7 +6,7 @@ from copy import copy
from enum import Enum
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Base.Logic')
+log = logging.getLogger(__name__)
class LogicType( Enum ):
NONE = ('')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py
index 2f9a5233326..e8cdc3e12e2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
-log = logging.getLogger("Menu.L1.Base.MenuConfObj")
+log = logging.getLogger(__name__)
class TopoMenuDef:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuUtils.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuUtils.py
index 8ada388c103..c77fdbb0eca 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuUtils.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuUtils.py
@@ -3,7 +3,7 @@
__all__ = ['log', 'idgen', 'binstr', 'get_smk_psk_Name']
from AthenaCommon.Logging import logging
-log = logging.getLogger("Menu.L1.Base.MenuUtils")
+log = logging.getLogger(__name__)
# unique id generator
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MonCounters.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MonCounters.py
index ececfac5e25..a21b0dd2fd9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MonCounters.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MonCounters.py
@@ -4,7 +4,7 @@ from collections import OrderedDict as odict
from functools import total_ordering
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Base.MonCounters')
+log = logging.getLogger(__name__)
class MenuMonCountersCollection(object):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/PrescaleHelper.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/PrescaleHelper.py
index 75877b8bf01..39538eb09fa 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/PrescaleHelper.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/PrescaleHelper.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Base.PrescaleHelper')
+log = logging.getLogger(__name__)
"""
The prescaling uses a pseudo-random binary sequence generator of 24 bit width (31 bit internal)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/ThresholdType.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/ThresholdType.py
index e02038c76fa..9c88ddb901b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/ThresholdType.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/ThresholdType.py
@@ -4,7 +4,7 @@ from enum import Enum, unique
from functools import total_ordering
from AthenaCommon.Logging import logging
-log = logging.getLogger("Menu.L1.Base.ThresholdType")
+log = logging.getLogger(__name__)
@total_ordering
@unique
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
index 7926fcab46d..271f2efd472 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
@@ -12,7 +12,7 @@ from .ThresholdType import ThrType
from .Limits import CaloLimits as CL
from .TopoAlgorithms import AlgCategory
-log = logging.getLogger("Menu.L1.Base.Thresholds")
+log = logging.getLogger(__name__)
class MenuThresholdsCollection( object ):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgorithms.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgorithms.py
index 604ae7398dd..801df1c26bc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgorithms.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgorithms.py
@@ -5,7 +5,7 @@ from operator import attrgetter
from enum import Enum
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Base.TopoAlgorithms')
+log = logging.getLogger(__name__)
from .TopoAlgos import DecisionAlgo, MultiplicityAlgo, SortingAlgo
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py
index 0d59427cd81..4e819eb6bc1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py
@@ -8,7 +8,7 @@ import re
from .ThresholdType import ThrType
-log = logging.getLogger("Menu.L1.Base.TopoAlgos")
+log = logging.getLogger(__name__)
##
## These classes are base classes for the auto-generated algorithm python representations
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/CTPInputConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/CTPInputConfig.py
index d663ac6ebbb..e5a70b9b665 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/CTPInputConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/CTPInputConfig.py
@@ -3,7 +3,7 @@
from collections import OrderedDict as odict
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Config.CTPInputConfig')
+log = logging.getLogger(__name__)
class CTPInputConfig:
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
index c6925d41b52..6a19003c51f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
@@ -11,7 +11,7 @@ import traceback
from ..Base.L1MenuFlags import L1MenuFlags
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Config.ItemDef')
+log = logging.getLogger(__name__)
# The trigger types
from ..Base.Limits import Limits
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/LegacyTopoMergerMap.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/LegacyTopoMergerMap.py
index e06a8e50fe1..40b399b04d5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/LegacyTopoMergerMap.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/LegacyTopoMergerMap.py
@@ -3,7 +3,7 @@
from collections import namedtuple, OrderedDict as odict
from AthenaCommon.Logging import logging
-log = logging.getLogger("L1.Config.LegacyTopoMergerMap")
+log = logging.getLogger(__name__)
MC = namedtuple('MC', "target_bit, topo_board, source_bit, signals")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py
index 36e399001e9..97c472afdf8 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py
@@ -30,7 +30,7 @@ For each of these type 64 L1Items can be monitored independently
"""
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Config.MonitorDef')
+log = logging.getLogger(__name__)
from ..Base.MonCounters import CtpinCounter, CtpmonCounter
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
index 989443c8e54..4630867a31b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
@@ -8,7 +8,7 @@ import L1TopoHardware.L1TopoHardware as HW
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Config.TopoAlgoDef')
+log = logging.getLogger(__name__)
class TopoAlgoDef:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefLegacy.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefLegacy.py
index aa085bcf83f..2941dc1f356 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefLegacy.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefLegacy.py
@@ -6,7 +6,7 @@ from .TypeWideThresholdConfig import getTypeWideThresholdConfig
import L1TopoAlgorithms.L1TopoAlgConfig as AlgConf
import L1TopoHardware.L1TopoHardware as HW
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Config.TopoAlgoDefLegacy')
+log = logging.getLogger(__name__)
class TopoAlgoDefLegacy:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMuctpi.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMuctpi.py
index c15eb08dcea..cc70bfbfa0f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMuctpi.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMuctpi.py
@@ -6,7 +6,7 @@ import L1TopoHardware.L1TopoHardware as HW
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Config.TopoAlgoDefMUTCPI.py')
+log = logging.getLogger(__name__)
class TopoAlgoDefMuctpi:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py
index a2444070e76..3501a133671 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Config.TopoMultiplicityAlgoDef')
+log = logging.getLogger(__name__)
from ..Base.TopoAlgos import EMMultiplicityAlgo, TauMultiplicityAlgo, JetMultiplicityAlgo, XEMultiplicityAlgo
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TriggerTypeDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TriggerTypeDef.py
index 2da23b4f973..51a17eeefa6 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TriggerTypeDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TriggerTypeDef.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Config.TriggerTypeDef')
+log = logging.getLogger(__name__)
class TT(object):
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py
index adcdf887836..dfb3c3b3c89 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TypeWideThresholdConfig.py
@@ -3,7 +3,7 @@
from collections import OrderedDict as odict
from AthenaCommon.Logging import logging
-log = logging.getLogger('Menu.L1.Config.TypeWideThresholdConfig')
+log = logging.getLogger(__name__)
from ..Base.ThresholdType import ThrType
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
index 9855f586dd3..89a6bbda954 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
@@ -31,7 +31,7 @@ Building a menu happens in two stages
* Thresholds are defined in files ThresholdDef.py
"""
-log = logging.getLogger("Menu.L1.L1MenuConfig")
+log = logging.getLogger(__name__)
class L1MenuConfig(object):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/L1TopoFlags.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/L1TopoFlags.py
index 23fdf41ae0a..f76ca8a581e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/L1TopoFlags.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/L1TopoFlags.py
@@ -7,7 +7,7 @@ L1Topo specific flags
from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
from AthenaCommon.Logging import logging
-log = logging.getLogger('TriggerMenuMT.LVL1MenuConfig.L1Topo.L1TopoFlags.py')
+log = logging.getLogger(__name__)
_flags = []
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/L1TopoMenu.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/L1TopoMenu.py
index 1f07b2ff986..ae6ad1ce536 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/L1TopoMenu.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/L1TopoMenu.py
@@ -2,7 +2,7 @@
from. TopoOutput import TriggerLine
from AthenaCommon.Logging import logging
-log = logging.getLogger("TriggerMenuMT.l1topo.L1TopoMenu")
+log = logging.getLogger(__name__)
class L1TopoMenu(object):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/TopoAlgos.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/TopoAlgos.py
index aaf90ac9fc3..3315975a824 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/TopoAlgos.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1Topo/TopoAlgos.py
@@ -3,7 +3,7 @@
from AthenaCommon.Logging import logging
from TriggerJobOpts.TriggerFlags import TriggerFlags
-log = logging.getLogger("TopoAlgo")
+log = logging.getLogger(__name__)
class TopoAlgo(object):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py
index 9d7738d7865..6e9e9116634 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py
@@ -5,7 +5,7 @@
#
from AthenaCommon.Logging import logging
-log = logging.getLogger('TriggerMenuMT.L1Topo.TopoAlgoDef')
+log = logging.getLogger(__name__)
from TriggerJobOpts.TriggerFlags import TriggerFlags
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/BunchGroupSet.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/BunchGroupSet.py
index f75313f8e17..199f3644cca 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/BunchGroupSet.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/BunchGroupSet.py
@@ -4,7 +4,7 @@ from .Limits import Limits
from .Lvl1Flags import Lvl1Flags
from AthenaCommon.Logging import logging
-log = logging.getLogger("TriggerMenuMT.LVL1MenuConfig.LVL1.BunchGroupSet")
+log = logging.getLogger(__name__)
def setDefaultBunchGroupDefinition(bgs):
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py
index e3999068526..a9408608a7b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py
@@ -3,7 +3,7 @@
from .Limits import Limits
from AthenaCommon.Logging import logging
-log = logging.getLogger("Cabling")
+log = logging.getLogger(__name__)
log.setLevel(logging.INFO)
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Limits.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Limits.py
index f371bb7b725..f376c509664 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Limits.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Limits.py
@@ -5,7 +5,7 @@ This temporarily holds CTP sizes
"""
from AthenaCommon.Logging import logging
-log = logging.getLogger('LVL1.Limits')
+log = logging.getLogger(__name__)
class Access(type):
"""Metaclass to implement __getattr__ for class variables"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1Flags.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1Flags.py
index adaed177fdf..b2fcfb01748 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1Flags.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1Flags.py
@@ -11,7 +11,7 @@ from .Limits import Limits
__author__ = 'J.Stelzer'
__doc__="Level 1 specific flags for Run 2"
-log = logging.getLogger('LVL1.Lvl1Flags.py')
+log = logging.getLogger(__name__)
_flags = []
class CTPVersion(JobProperty):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1Menu.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1Menu.py
index 69a56fd4a4f..d42027462d0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1Menu.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1Menu.py
@@ -10,7 +10,7 @@ from .Limits import Limits
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaCommon.Logging import logging
-log = logging.getLogger("TriggerMenuMT.LVL1MenuConfig.LVL1.Lvl1Menu")
+log = logging.getLogger(__name__)
class Lvl1Menu(object):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1MenuItems.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1MenuItems.py
index 09485781076..c3883abfe6d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1MenuItems.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1MenuItems.py
@@ -4,7 +4,7 @@ from .PrescaleHelper import getCutFromPrescale, getPrescaleFromCut
from .Lvl1MenuUtil import oldStyle
from AthenaCommon.Logging import logging
-log = logging.getLogger("LVL1MenuItem")
+log = logging.getLogger(__name__)
class LVL1MenuItem(object):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1MenuUtil.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1MenuUtil.py
index cbc7b970d2b..37e3ec7cbb2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1MenuUtil.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Lvl1MenuUtil.py
@@ -3,7 +3,7 @@
__all__ = ['log', 'idgen', 'binstr', 'get_smk_psk_Name', 'oldStyle']
from AthenaCommon.Logging import logging
-log = logging.getLogger("TriggerConfigL1")
+log = logging.getLogger(__name__)
# Old CTP = Old CTP
def oldStyle():
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/XMLMenuReader.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/XMLMenuReader.py
index 5d57568072c..89aa042e768 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/XMLMenuReader.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/XMLMenuReader.py
@@ -12,7 +12,7 @@ from Lvl1MonCounters import Lvl1CtpinCounter, Lvl1CtpmonCounter
from AthenaCommon.Logging import logging
-log = logging.getLogger("TriggerConfigLVL1")
+log = logging.getLogger(__name__)
def readLogic( logicElement, thresholdMap ):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ItemDef.py
index 064aa4d32bc..b27ef26176a 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ItemDef.py
@@ -17,7 +17,7 @@ from ..LVL1.Lvl1Condition import ThrCondition, Lvl1InternalTrigger
from AthenaCommon.Logging import logging
-log = logging.getLogger('TriggerMenuMT.Lvl1.py')
+log = logging.getLogger(__name__)
class ItemDef(object):
"""
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/L1Seeds.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/L1Seeds.py
index 5916479f7d1..0773e5eb1d4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/L1Seeds.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/L1Seeds.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
-log = logging.getLogger("TriggerMenuMT.LVL1MenuConfig.L1Seeds")
+log = logging.getLogger(__name__)
from TriggerJobOpts.TriggerFlags import TriggerFlags
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/MonitorDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/MonitorDef.py
index 57b921c9e95..f538e234880 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/MonitorDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/MonitorDef.py
@@ -32,7 +32,7 @@ For each of these type 64 L1Items can be monitored independently
from TriggerMenuMT.LVL1MenuConfig.LVL1.Lvl1MonCounters import Lvl1CtpinCounter, Lvl1CtpmonCounter
from AthenaCommon.Logging import logging
-log = logging.getLogger('LVL1Menu.MonitorDef')
+log = logging.getLogger(__name__)
class MonitorDef(object):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/TriggerConfigL1Topo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/TriggerConfigL1Topo.py
index 83771f8854a..1b2a6b30061 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/TriggerConfigL1Topo.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/TriggerConfigL1Topo.py
@@ -4,7 +4,7 @@ from .L1Topo.L1TopoMenu import L1TopoMenu
from .L1Topo.L1TopoFlags import L1TopoFlags
from AthenaCommon.Logging import logging
-log = logging.getLogger("TriggerConfigL1Topo")
+log = logging.getLogger(__name__)
class TriggerConfigL1Topo(object):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/TriggerConfigLVL1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/TriggerConfigLVL1.py
index 46b1a22f67e..6f4a6674a22 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/TriggerConfigLVL1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/TriggerConfigLVL1.py
@@ -8,7 +8,7 @@ from .LVL1.Lvl1Flags import Lvl1Flags
from AthenaCommon.Logging import logging
-log = logging.getLogger("TriggerConfigLVL1")
+log = logging.getLogger(__name__)
class TriggerConfigLVL1(object):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/SerializeAPI.py b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/SerializeAPI.py
index a3d5c3f7ce3..7fe9ea6eec7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/SerializeAPI.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/SerializeAPI.py
@@ -10,7 +10,7 @@ from TriggerMenuMT.TriggerAPI.TriggerInfo import TriggerInfo, TriggerChain
from TriggerMenuMT.TriggerAPI.TriggerEnums import TriggerPeriod
from PathResolver import PathResolver
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.TriggerAPI' )
+log = logging.getLogger(__name__)
privateJsonFile = "TriggerInfo.json"
def dump(db, f=privateJsonFile):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerAPI.py b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerAPI.py
index 389ac55a904..a4b97ded446 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerAPI.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerAPI.py
@@ -11,7 +11,7 @@ from TriggerMenuMT.TriggerAPI import SerializeAPI
from AthenaCommon.Logging import logging
class TriggerAPI:
- log = logging.getLogger( 'TriggerMenuMT.TriggerAPI' )
+ log = logging.getLogger(__name__)
dbQueries = {}
customGRL = None
release = None
@@ -159,7 +159,7 @@ class TriggerAPI:
def main(dumpFullAPI=False):
''' Run some tests or dump the full pickle/json for CalibPath '''
- log = logging.getLogger( 'TriggerMenuMT.TriggerAPI.main' )
+ log = logging.getLogger(__name__)
if dumpFullAPI:
for triggerPeriod in TriggerPeriod:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerDataAccess.py b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerDataAccess.py
index c44f4985b48..f2d430fa879 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerDataAccess.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerDataAccess.py
@@ -8,7 +8,7 @@ import sys
from TriggerMenuMT.TriggerAPI.TriggerEnums import TriggerPeriod, LBexceptions, TriggerRenaming
from TriggerMenuMT.TriggerAPI.TriggerPeriodData import TriggerPeriodData
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerAPI.TriggerDataAccess' )
+log = logging.getLogger(__name__)
import six
@@ -164,7 +164,7 @@ def queryHLTPrescaleTableRun2(connection,psk):
def fillHLTmap( info, hltMap_prev , lbCount, run, grlblocks):
from TrigConfigSvc.TrigConfigSvcUtils import getL1Items, getL1Prescales
- mutelog = logging.getLogger( "TrigConfigSvcUtils.py" )
+ mutelog = logging.getLogger(__name__)
mutelog.setLevel(logging.ERROR) #avoid the spam from TrigConfigSvcUtils
items = getL1Items('TRIGGERDB', info['smk']) # returs map item name => CTP ID
@@ -307,7 +307,7 @@ def getHLTmap_fromTM(period, release):
TriggerFlags.readLVL1configFromXML = True
TriggerFlags.outputLVL1configFile = None
- mutelog = logging.getLogger( 'Menu.L1.L1MenuConfig' )
+ mutelog = logging.getLogger(__name__)
mutelog.setLevel(logging.WARNING) #avoid spam from Menu.L1.L1MenuConfig
ConfigFlags.Trigger.triggerMenuSetup = menu
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerEnums.py b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerEnums.py
index e9be621858c..9d032263a90 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerEnums.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerEnums.py
@@ -124,7 +124,7 @@ class TriggerRenaming:
if __name__ == "__main__":
from AthenaCommon.Logging import logging
- log = logging.getLogger( 'TriggerMenuMT.TriggerAPI.TriggerEnums' )
+ log = logging.getLogger(__name__)
log.info(TriggerPeriod.y2015.isBasePeriod() )
log.info(TriggerPeriod.y2017.isBasePeriod() )
log.info(TriggerPeriod.basePeriods() )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerInfo.py
index 1bbbe31a5b9..d7979eb6f43 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerInfo.py
@@ -9,7 +9,7 @@ from TriggerMenuMT.TriggerAPI.TriggerEnums import TriggerType, TriggerPeriod
from collections import Counter
import six
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenuMT.TriggerAPI.TriggerInfo' )
+log = logging.getLogger(__name__)
class TriggerInfo:
''' Object containing all the HLT information related to a given period.
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerPeriodData.py b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerPeriodData.py
index 55f1ab3d299..37fa9e27977 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerPeriodData.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/TriggerAPI/TriggerPeriodData.py
@@ -218,7 +218,7 @@ class TriggerPeriodData:
def test():
from AthenaCommon.Logging import logging
- log = logging.getLogger( 'TriggerMenuMT.TriggerAPI.TriggerEnums' )
+ log = logging.getLogger(__name__)
log.info(TriggerPeriodData( TriggerPeriod.y2017 ).grl)
log.info(TriggerPeriodData( TriggerPeriod.y2017lowmu ).grl)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/__init__.py b/Trigger/TriggerCommon/TriggerMenuMT/python/__init__.py
index e69de29bb2d..0126f1ce182 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/__init__.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/__init__.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.Logging import logging, log
+
+class TriggerMenuMTFormatter(logging.Formatter):
+ """Custom formatter for loggers within TriggerMenuMT package.
+
+ Logger names of type 'TriggerMenuMT.M1.M2.M3' will be shortened to
+ 'TriggerMenuMT:M3' to avoid long logger names. Since the logging module
+ automatically applies log formats of parents to children this applies to
+ all loggers that are created via `logging.getLogger(__name__)` within
+ the TriggerMenuMT package.
+ """
+ def format(self, record):
+ fields = record.name.split('.')
+ if len(fields)>1:
+ record.name = ':'.join([fields[0], fields[-1]])
+ return super().format(record)
+
+
+def _setupLogger(logger):
+ """Configure TriggerMenuMT logger"""
+ import copy
+ # Create custom handler/formatter but relying on athena defaults:
+ athena_hdlr = log.handlers[0]
+ hdlr = copy.copy(athena_hdlr)
+ hdlr.setFormatter(TriggerMenuMTFormatter(athena_hdlr.formatter._fmt))
+
+ logger.propagate = False # avoid message duplication
+ logger.addHandler(hdlr)
+
+
+# Create TriggerMenuMT root logger:
+_log = logging.getLogger(__name__)
+_setupLogger(_log)
+_log.debug("Configuring TriggerMenuMT logger")
--
GitLab