diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetChainConfiguration.py
index 79be0a019d37c6e2615a2d2a788e62b34e6fa5b5..e67075415eb0aa6111c120d47946b7ea0425ab83 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 f127e6eefe748d705e4b49e46e050e515db117f9..659dabee2cdcb8aacb80bd61d8a6989e7e98cd23 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 b9912fde0ca8a7fd7929cb4a8d90a5ca9c6a36cb..295261b4bdfdf5b8c2d7805866472f2c95591a01 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 edb093fa95d7c18f993fafefa82ac885e1266903..c0c89bbc3e95e9169eb0f9bc31ed56627387f8f9 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 8ff3476d02e2db1b545b6df835c3b59e6c5c02d4..b7b2b19ff11efb23bd53689885d4fcd41070db82 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 735b483856d4e4de39594b65d26eda5659463321..a8825b4f105fb71ffaddf3cd78a3bde88e30eaae 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 ede1b85b91abaa4c65277472299757616788dfb0..b50303aecdff115ff8b06090199dfb171807a098 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 5ec5bc8fbc5c78a5eb585330248e0a89c41f1d6e..2e64c1f6e1c8098c36548669fe74cee882da9548 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 5adfbcbd6d298ff6dff733f6cc1050723f8cccd9..57894a329dfd1855431dbc3752a1dc9db86ce848 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 f63dbcdc81f142c8f6d8629dc1f53859351df951..7406176dd71e4ef35b6ef0e08bc01ecf647791da 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 6af9e6d65439625ad94fc406af071e21ab52424c..9281e22ab361c43c2650a758fd4a8a00a10342d2 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 3135a2310eaa9889c65dc544b709c9f05770496e..705e20285fb52fcc84ec97a69f638238ab419ecd 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 74bd4cfa0bb9abd1d4a4b3b5bfae194ba48d6322..1d060960ff830e6984dedc326a829a0094e8971a 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 a7e8521b5b128392aaa117da705c35c524f96ad5..10915141ebfb1d6af3ea8c8b6b557ad993e2d3cc 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 aeacfabd9df39e5adc43e6a17466a2f8713379b2..e3ef12d58df7594658bdefe2736df4394057b786 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 84673850a1cbf3e65a31ec1d97569191264fe6b1..eb0d22a22291db187a46a6961faff426b63934d7 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 dd9e0df7e2ce37f77cfc36b9007c7cab01946711..d2369c46bc1738ba4989d377fc4deb81b592919f 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 e7f587269dfdfb070a4c97223a704ec9434f2527..50729035041c75fb50ff1d32cd11359849a9c6b6 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 4097e32800c441134a7ba09e994d677507d5dd3b..a4f164ce194f197cb1ca5859448d993c127459dc 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 1cc616bacc9376ca0e23b22c46008173d78659aa..4e1ea0e78f5ad045c716440d83a8b3c27b59b7f3 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 ecc9f1849bc87b9fd9d90234c837d2adabea8d1b..9a4700063c95a390ac7bf0fcd7cda41d78f45054 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 8a3ec78169f121bb7916bdef8c3eee967f17e161..e092aae9977650c55af0b46d6cb76a62a5e586e6 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 f9aa88521d905e17c1ff4d942ce4586040360569..f361355fe36fae989bc8931e41b5a8bbfd8824d1 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 b42971c1e10c29e8051660439301b1ed62f8b9c6..3ee7ad3cd786e3eeaacb5bf4e525bf32ef7c1899 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 16e1e0884975ed3ca78159eb880ce88e9dfe75b2..ebeb216494520975b268a9fd2a2241454e77a021 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 3025f10a471cfc081f383e07f631e5ea0523d45c..6aa6fb2e3b5776e8946e1cc65178c5ce0ec0fd5f 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 753a451e90f33135dc652c327ff386488c460f29..8de6a7d3c6dc7795c48c4b540e3427702f6e6c9b 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 0626ad43171d885e7f879209d010f363774e46d2..864fc4e934fdc8e3792a0bf39321476666fb2f80 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 3f70b992f79cb2b8988f566e11730883e3902965..44b4984854fa58f4f25002dc81e5093f5767a55c 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 989b904c5b97fc18ea9a0fcf3387dd0807d63bde..cecec03a0ae1639afca3a9d26de2cbc96295dcd0 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 c01395b02be1957ec5521ea650fa59125078d5eb..cab18e65f325399f895afa8b85eb6008318d9436 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 6d3049f27d8f820000f6de1d5b07c9b9a0a952f0..cefd34224ce87fef522f7cf047d3a032db1bbc85 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 1bb26e663e6896de979f56dc8b40a143d5ccdb25..56ca9cc5ce9e98176fe0c4138aed36258aa10f33 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 5f7acd2492cb7637091856f7a91cc37c55501b67..96977bf0e898c7d64566f809bd5be9f9ed807a29 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 495e90915de4713b0a28166b4ffe01adf004f4a5..e3b8e5fd8475b3c84e1e12934a255118f53597bc 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 c26e33e1147de0f61414a39214f4efba0be4d344..df41ab201b9ebdf51e3c018e55dcc2cc4d245940 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 7666d3db609de59e11b0c1dd2570f61d1a3ec2f5..eace8e5aa414c79d171f1d7273c6419e4fcdb11d 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 22f401f2b5f6b9cd20a048e352d0651b202629b1..3c972449e63a194665436a4e880f1857fb32c7e8 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 77e5fb66e5fbde0838b5ebebb237580355962c13..ce26d1eec53d094768f823b1d4af0a6005767b4b 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 94346f18230ce5c6e8900b2cf296c57634acbb10..7d1837ecf0e756bf6bad50ea1d5f1d289f09e8f8 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 c9f414318a3099b09b9a43d8d7c2c602d604a1a8..a51660e210a68d567f6735286af4823e5a118d5e 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 43afb4537e5d66212ecbe090fffce3fc697ba89c..bc291b8de7fe4705cdd36b71c2fd2da85104a0fb 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 93f836f285ef4fc2ae46ba2eb68a47602501246d..8f002cc74d3a316e17947bedbf7645bf5c9b8484 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 ea238beb1b21a2fbeadc4b777fb25ac63914e7d4..bc2e56b740c95d8939845d009c84f43cf6fe7f8c 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 a363662eba1e6b006b5d0e911ad4d123be3c6e28..9aec5989e3bd38059a1da11bddfd8eb9c87b0637 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 addfb406684ad4243a01463f762c3a66ef80e974..e00e9f863128d86e1ae5f4cda95ff38e50209d78 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 763f3e34cc0f269bd7bdad75cd0e53a75e6914ef..7518a92ec4b08e9b63acaa1e0d3cc4b558995c69 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 d7e5e227f3d134410f9a01954c23d95c3497b91a..38e69faed62bb98795852760753770e9513fab8c 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 5578c3bb651ab3e7f43f1d68deabf9372edf90c8..f25b6545daf8977850193215ef47fc40ca5ea8f9 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 9b5c28d53e4c634f54ec1722f581ee55bf482879..d8ece61a49886234da61d9e97ea5243ef11fecc3 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 41a3a7dbdf01271915c7547618fe7bb736add98e..7e5354c332ed85c151fe30eb7b07bad676713c5e 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 4fc3b8b97a4afe59c8c245d6e2a2771d7d6510e3..27b69c1fd99bf6fd982e2c2a73f1411519b47927 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 78e8d3d6bca5ed5819007e4856858c79cb6a7c7d..ccc142f0af466767fc6ad2a291ba0d98dd739cfc 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 11ae0280ca219d94ec6a0fd0bb7d87f5ce767c66..6da7eef0dd3780aa0d1f669f74422c763a55e3a6 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 cd6a1eee489375b92c2d3281c37f9a16cc85e4eb..5967fefc685c8e4261e1af15096aad3ce77d3f2c 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 5d47cfad826f4fccf1839e132fd48c8451fc89a0..c04aa64e70e2f01739627c938bce918a584baf7e 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 15030c0af136c7d5a8db0102bf00a99f6a390b63..19675579d6dd941181efb6198b9290d17c2457b3 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 f51ba7ff4e8263276d34246b3799b3bbddf8a87d..ec6088a12b367fb28831cf619961dd010573b03e 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 4a35fa64dd952f6997e0888b7d66ae8107c2cd72..518688f11f7f7521f79c12f59011c6409487b862 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 9b23fd6cf91958aecf3714ee8336a99ce0b28b3b..45439b71c0f72095738f8b5abed4a2235fad63b4 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 6bf0ddf7d857808ec0717220c5c196d7c65a90a4..92742ff9ea10e9962feb30fed545f160a315ce55 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 5fcc5071ece84bea508aa12e7492f8cfab3e26b7..3c82978fa43d7ec14883c2931c84f0a6836f392e 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 8e15366f391134082f2846f824ce2a3c074e3da8..0ce88d5e850bb8b87e780514cff1b4e6c635962f 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 96710ea05db2ab7dab6c4accc9eb081afa8a46c6..c9a9a49acc850287dd696426566c59025cc8cbeb 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 7cae0a54d24642426ad0dfd294fd02910ff0600c..2b86715508c20142ad14a2df2f164c68ce4ad218 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 cb7713fdf427a95be4f267d2423430575f921602..eb022c5b2bd5d7ff02d3527402eb4bd9f75f00b5 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 7544eff43215f107672640311d788cfe01f1fe2f..ed5762cc3a7bebf3e1df3e74c667d8356474738c 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 ca4decbb7735027d8aab0e9387e62ea85d75244f..a92d61ea873697cb16de45df3bc6524ac6372f64 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 aa4e7d705875ddebbc187304fe08fb87b4b8a1c9..bcf5587d2bbe6ce4d6d4d6d7de5655e5115a35c8 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 d0abc68da3a864c0f5837fbeff8f895b0d0a65ba..82e2444415c8bb83414e8fbef751ec42a3fde64a 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 20bec182a3b8924f749d71db730df71b45c3de78..22c8744a76be564d1f77b0f11468cc036e24a52c 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 2f9a5233326f92ecd86bb125400fd2c410aed86a..e8cdc3e12e27c810ad471a0118e2acbbab6fbddb 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 8ada388c103db4ce687ca58bbf13ff1c09b9ded4..c77fdbb0ecaf69c2748482a1bdd929c020ef5e1c 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 ececfac5e25ea1559cbb275aaa61d7a05198c7ae..a21b0dd2fd9be70c94b68abef376561a3a50dde7 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 75877b8bf01ffd2c888511e192683c1b1a929fd4..39538eb09fa11900b5f4f4e0ed115ad16e378efa 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 e02038c76fa9bc05192c8f25fc330105a061e72f..9c88ddb901bc7dda896962d55aac5061b32e58b1 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 7926fcab46d45081d247f524e4962f94939032a0..271f2efd472c448913b078bf9587789c02376703 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 604ae7398dda7d086781921a30d3e8085a875726..801df1c26bcee0ab7192200f55f4bc7f4e9088c6 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 0d59427cd81e70c84bcb73c824fa0b182245a51e..4e819eb6bc1d5ab7bed1b9495e429c6c59c8d452 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 d663ac6ebbbd430225a1f9fe9b330ef911a9d215..e5a70b9b6653b30a0f45d9c54575533bbb48718c 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 c6925d41b5273e2839e8643b7f59e8915546ae03..6a19003c51f87686e12c154b34ae09e333be9328 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 e06a8e50fe1485a62296df33fa7bdbc35d835068..40b399b04d5e1c3a67f9c23b6cfbceacddbc2ab0 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 36e399001e9d2a1334e7db807544f6ef9457536a..97c472afdf819eb6ab3680159b1799b68dae5f00 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 989443c8e54f489018423ca2f6c28278511b202b..4630867a31bee609cfdf822f58a83f177e4a4b4f 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 aa085bcf83f30a4d5eb5b86af6691ec1a8a01aa0..2941dc1f356f246ebf6f6ce8747c0cf7eef98867 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 c15eb08dcea19fb8b5f38a9b286083a7f7b124ba..cc70bfbfa0f17269f9e4032c26fe8de1aa0989a9 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 a2444070e76673802b76fadbbc1a6d6708fbef17..3501a13367194e200f29caa241f0fde1c1ec3b59 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 2da23b4f9735c054838f4559dd24cfef84255e6e..51a17eeefa6f2a4d7754b79fd8431a433d9d8fb8 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 adcdf8878366b8e34e41543dda89ef05a7877acb..dfb3c3b3c892bca37defcb572873c4760ce466b3 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 9855f586dd3946cb03ea984c3fa4149109142ca9..89a6bbda9544cc47b3f0ec1a99c17b9a52fb79ec 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 23fdf41ae0a3c8a2f81df516698926e72704603e..f76ca8a581ecd02f3426c280b0b7f6670cccf81c 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 1f07b2ff986b02dfaab17db03143140c110d08f4..ae6ad1ce5368b559eeb322582dac661ce69a7bba 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 aaf90ac9fc3d2fd445b8a011041f9fa85450c155..3315975a824ec4dbd7ce91827e9ff2c853114930 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 9d7738d786535fbcf82798dbafb5bf34c8b87f0c..6e9e9116634335f1f78441efe8c7aafc3593bebf 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 f75313f8e17734807ad190e68cb9f96d0e4eea8e..199f3644cca43daaa17c615273ed79c736acbbea 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 e39990685260604f8e15ba506b3f14ec6fe7b26e..a9408608a7bdc8e81fae14546e9b627856ac3aa3 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 f371bb7b725c5c7da55e108696db8b379a2c36cc..f376c5096647980ba18327902348cf2998a96001 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 adaed177fdf36b557536f774c06ad467febb914f..b2fcfb01748768a06138d7e2b2be22fa95e9fa03 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 69a56fd4a4f050f3397aa98722a51946d75e5e20..d42027462d0a43ba8ab12071926a229b5500c020 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 094857810769f5e41f458a62592f83844f65d063..c3883abfe6d324e4b1ae9d73570d2e9cac6d66eb 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 cbc7b970d2b6dd7f684da54c0fe3792906a69cfd..37e3ec7cbb28cda2d11b2c459a960e30f59fa02d 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 5d57568072cead62d18cc13402cb93dbc708eea6..89aa042e768a75abe209e0d7d97ef3c6c09f497a 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 064aa4d32bc69f8019cccef2293edd7c3b554bee..b27ef26176a22374ca88aa7add0bce000ce77949 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 5916479f7d1610402a549284d47c56fe5169e577..0773e5eb1d4cef8c956e1a39fb15ba1b68a91ee5 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 57b921c9e959e287a99bbf595f356017da114c61..f538e2348800b8728956f6c92842ce9462ca9112 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 83771f8854a65341e1a8db5ce075dd53be8c653e..1b2a6b30061be7cdb409447fe02a4c2221ce2d43 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 46b1a22f67e08710f94457bc44962b50a49c8909..6f4a6674a2216890ae8ee73d3a9af5fc44daed01 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 a3d5c3f7ce31c96dbb01881ee9e144b0cf532dcd..7fe9ea6eec73a33f7eefe0e94bb2c244ca4543e7 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 389ac55a904a8eb1153a2b6ae4a80848c63c9b67..a4b97ded44632cab449bd30901b16aca05145277 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 c44f4985b483072140ba1c28557b4d86d0f08555..f2d430fa879872a6ff693306e775081224aed909 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 e9be621858c72f9e7a9c533cfc63618c66349f9d..9d032263a90d9b73808422a2920191d2a1eb2d5a 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 1bbbe31a5b98415fe9f37600081e0e5875b0bc37..d7979eb6f4353740663cbad79ff90e39a9afb688 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 55f1ab3d299051e62d7021fd8d6c8a3f2ce6f9d9..37fa9e279774978695c2bea6c1884bdae220f7f2 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0126f1ce182175584011ffe33963675272d6ecdc 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")