diff --git a/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py b/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
index 6738ef8e8a65b68365ee4541cb0211afbe08465d..afc21873354f73a3a25544a15b405a65e197929b 100644
--- a/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
+++ b/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaCommon.SystemOfUnits import MeV
@@ -101,11 +101,11 @@ def CaloTopoClusterCfg(configFlags):
if __name__=="__main__":
- from AthenaConfiguration.CfgLogMsg import cfgLogMsg
+ from AthenaCommon.Logging import log
+ from AthenaCommon.Constants import DEBUG
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- cfgLogMsg.setLevel("debug")
-
+ log.setLevel(DEBUG)
ConfigFlags.set("global.isMC",False)
ConfigFlags.set("global.InputFiles",["myESD.pool.root"])
diff --git a/Calorimeter/CaloTools/python/CaloNoiseToolConfig.py b/Calorimeter/CaloTools/python/CaloNoiseToolConfig.py
index e2873b6bd96524783e09bcab0fb489c0517e5c14..a1dfb6a1f547d6516d195f9ca19ce132c6a47980 100644
--- a/Calorimeter/CaloTools/python/CaloNoiseToolConfig.py
+++ b/Calorimeter/CaloTools/python/CaloNoiseToolConfig.py
@@ -1,10 +1,11 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from IOVDbSvc.IOVDbSvcConfig import addFolders
from CaloTools.CaloToolsConf import CaloNoiseToolDB
-from AthenaConfiguration.CfgLogMsg import cfgLogMsg
+from AthenaCommon.Logging import logging
def CaloNoiseToolCfg(configFlags):
+ log = logging.getLogger(__name__)
result=ComponentAccumulator()
isMC=configFlags.get("global.isMC")
@@ -21,17 +22,17 @@ def CaloNoiseToolCfg(configFlags):
caloNoiseToolDB.FolderNames=[folder,]
if fixedLumi >= 0 :
caloNoiseToolDB.Luminosity = fixedLumi
- cfgLogMsg.info("online mode: use fixed luminosity for scaling pileup noise: %f"%fixedLumi)
+ log.info("online mode: use fixed luminosity for scaling pileup noise: %f", fixedLumi)
else:
if useCaloLumi:
lumiFolder='/CALO/Noise/PileUpNoiseLumi'
result.addConfig(addFolders,configFlags,lumiFolder,'CALO')
caloNoiseToolDB.LumiFolderName = lumiFolder
caloNoiseToolDB.Luminosity = -1.
- cfgLogMsg.info("online mode: use luminosity from /CALO/Noise/PileUpNoiseLumi to scale pileup noise")
+ log.info("online mode: use luminosity from /CALO/Noise/PileUpNoiseLumi to scale pileup noise")
else:
caloNoiseToolDB.Luminosity = 0.
- mlog.info("online mode: ignore pileup noise")
+ log.info("online mode: ignore pileup noise")
pass
result.addPublicTool(caloNoiseToolDB)
return result
@@ -40,18 +41,18 @@ def CaloNoiseToolCfg(configFlags):
if isMC:
if fixedLumi >= 0 :
caloNoiseToolDB.Luminosity=fixedLumi
- cfgLogMsg.info("Luminosity (in 10**33) units used for pileup noise from CaloNoiseFlags : %f" % fixedLumi)
+ log.info("Luminosity (in 10**33) units used for pileup noise from CaloNoiseFlags : %f", fixedLumi)
else:
if useCaloLumi:
lumiFolder='/CALO/Ofl/Noise/PileUpNoiseLumi'
result.addConfig(addFolders,configFlags,lumiFolder,'CALO_OFL')
- cfgLogMsg.info("offline mode: use luminosity from /CALO/Ofl/Noise/PileuUpNoiseLumi to scale pileup noise")
+ log.info("offline mode: use luminosity from /CALO/Ofl/Noise/PileuUpNoiseLumi to scale pileup noise")
caloNoiseToolDB.LumiFolderName = lumiFolder
caloNoiseToolDB.Luminosity=-1.
else:
- estimatedLumi=configFlag.get("global.estimatedLuminosity")
+ estimatedLumi=configFlags.get("global.estimatedLuminosity")
caloNoiseToolDB.Luminosity=estimatedLumi/1e+33
- cfgLogMsg.info(" Luminosity (in 10**33) units used for pileup noise from global flags: %f"%caloNoiseToolDB.Luminosity)
+ log.info(" Luminosity (in 10**33) units used for pileup noise from global flags: %f", caloNoiseToolDB.Luminosity)
folders = (("CALO_OFL","/CALO/Ofl/Noise/CellNoise"),
@@ -63,17 +64,17 @@ def CaloNoiseToolCfg(configFlags):
# for luminosity
if fixedLumi >= 0 :
caloNoiseToolDB.Luminosity = fixedLumi
- mlog.info("offline mode: use fixed luminosity for scaling pileup noise: %f"%fixedLumi)
+ log.info("offline mode: use fixed luminosity for scaling pileup noise: %f", fixedLumi)
else :
caloNoiseToolDB.Luminosity = -1
if useCaloLumi:
lumiFolder='/CALO/Ofl/Noise/PileUpNoiseLumi'
result.addConfig(addFolders,configFlags,lumiFolder,'CALO_OFL')
- cfgLogMsg.info("offline mode: use luminosity from /CALO/Ofl/Noise/PileUpNoiseLumi to scale pileup noise")
+ log.info("offline mode: use luminosity from /CALO/Ofl/Noise/PileUpNoiseLumi to scale pileup noise")
else:
lumiFolder = '/TRIGGER/LUMI/LBLESTONL'
- result.addConfig(addFolders,configFlags,lumiFolder,'TRIGGER_ONL');
- cfgLogMsg.info("offline mode: use luminosity = f(Lumiblock) to scale pileup noise")
+ result.addConfig(addFolders,configFlags,lumiFolder,'TRIGGER_ONL')
+ log.info("offline mode: use luminosity = f(Lumiblock) to scale pileup noise")
caloNoiseToolDB.LumiFolderName = lumiFolder
diff --git a/Control/AthenaConfiguration/python/AutoConfigFlags.py b/Control/AthenaConfiguration/python/AutoConfigFlags.py
index 7452e464071b140c4499e13455b4a596c97bc71c..f8c94e3a6d9ddb3e17d9b855ddbc8a61f6398420 100644
--- a/Control/AthenaConfiguration/python/AutoConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AutoConfigFlags.py
@@ -1,4 +1,4 @@
-from AthenaConfiguration.CfgLogMsg import cfgLogMsg
+from AthenaCommon.Logging import log
from FilePeeker.FilePeeker import PeekFiles
@@ -8,13 +8,11 @@ _fileMetaData=dict()
def GetFileMD(filenames):
filename=filenames[0]
if not filename in _fileMetaData:
- msg=cfgLogMsg
if len(filenames)>1:
- msg.info("Multiple input files. Use the first one for auto-configuration")
- msg.info("Obtaining metadata of auto-configuration by peeking into %s" % filename)
+ log.info("Multiple input files. Use the first one for auto-configuration")
+ log.info("Obtaining metadata of auto-configuration by peeking into %s" % filename)
thisFileMD=PeekFiles([filename,])
_fileMetaData.update(thisFileMD)
return _fileMetaData[filename]
-
diff --git a/Control/AthenaConfiguration/python/CfgLogMsg.py b/Control/AthenaConfiguration/python/CfgLogMsg.py
index 81d3bf805efb07433ceb6ac0ab7cde85a4f2b3ef..9665f6384af162b14792c0c55134f0df32d84462 100644
--- a/Control/AthenaConfiguration/python/CfgLogMsg.py
+++ b/Control/AthenaConfiguration/python/CfgLogMsg.py
@@ -1,3 +1,7 @@
+
+import warnings
+warnings.warn("The CfgLogMsg module is deprecated. Please use AthenaCommon.Logging", UserWarning, stacklevel=2)
+
import os, inspect
class CfgLogMsg():
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index d7ee5e68f46e8517a037537164d47032f4f1b3b3..5992a7a8b48e9bb52f4381aa951f98f184682899 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -1,8 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-
-#from AthenaCommon.Logging import logging
-from AthenaConfiguration.CfgLogMsg import cfgLogMsg
+from AthenaCommon.Logging import logging
from AthenaCommon.Configurable import Configurable,ConfigurableService,ConfigurableAlgorithm,ConfigurableAlgTool
from AthenaCommon.CFElements import isSequence,findSubSequence,findAlgorithm,flatSequencers
from AthenaCommon.AlgSequence import AlgSequence
@@ -10,8 +8,6 @@ from AthenaCommon.AlgSequence import AlgSequence
from AthenaConfiguration.AthConfigFlags import AthConfigFlags
import GaudiKernel.GaudiHandles as GaudiHandles
import ast
-from collections import defaultdict
-from copy import deepcopy
class DeduplicatonFailed(RuntimeError):
@@ -36,8 +32,8 @@ class CurrentSequence:
class ComponentAccumulator(object):
- def __init__(self):
- self._msg=cfgLogMsg #logging.getLogger('ComponentAccumulator')
+ def __init__(self):
+ self._msg=logging.getLogger('ComponentAccumulator')
self._sequence=CurrentSequence.get() # sequence of algorithms
self._eventAlgs={} #Unordered list of event processing algorithms per sequence + their private tools
self._conditionsAlgs=[] #Unordered list of conditions algorithms + their private tools
@@ -108,9 +104,9 @@ class ComponentAccumulator(object):
if sequence != None:
seq = findSubSequence( seq, sequence )
if seq == None:
- raise ConfigurationError("Unable to add %s to sequence %s as it is missing" % ( algo.getFullName(), seq.name()) )
+ raise ConfigurationError("Unable to add %s to sequence %s as it is missing", algo.getFullName(), seq.name() )
- self._msg.debug("Adding %s to sequence %s" % ( algo.getFullName(), seq.name()) )
+ self._msg.debug("Adding %s to sequence %s", algo.getFullName(), seq.name() )
seq += algo
return algo
@@ -192,7 +188,7 @@ class ComponentAccumulator(object):
#print "concatenating list-property",comp.getJobOptname(),prop
setattr(comp,prop,oldprop)
else:
- #self._msg.error("component '%s' defined multiple times with mismatching configuration" % svcs[i].getJobOptName())
+ #self._msg.error("component '%s' defined multiple times with mismatching configuration", svcs[i].getJobOptName())
raise DeduplicationFailed("component '%s' defined multiple times with mismatching property %s" % \
comp.getJobOptName(),prop)
pass
@@ -202,13 +198,13 @@ class ComponentAccumulator(object):
pass
#end loop over properties
#We found a service of the same type and name and could reconcile the two instances
- self._msg.debug("Reconciled configuration of component %s" % comp.getJobOptName())
+ self._msg.debug("Reconciled configuration of component %s", comp.getJobOptName())
return False #False means nothing got added
#end if same name & type
#end loop over existing components
#No component of the same type & name found, simply append
- self._msg.debug("Adding service/Tool/CondAlog %s to the job" % newComp.getFullName())
+ self._msg.debug("Adding service/Tool/CondAlog %s to the job", newComp.getFullName())
compList.append(newComp)
return True #True means something got added
@@ -265,7 +261,7 @@ class ComponentAccumulator(object):
def setAppProperty(self,key,value):
if self._theAppProps.has_key(key) and self._theAppProps[key]!=value:
#Not sure if we should allow that ...
- self._msg.info("ApplicationMgr property '%s' already set to '%s'. Overwriting with %s"% (key,str(self._theAppProps[key]),str(value)))
+ self._msg.info("ApplicationMgr property '%s' already set to '%s'. Overwriting with %s", key, self._theAppProps[key], value)
self._theAppProps[key]=value
pass
@@ -285,7 +281,7 @@ class ComponentAccumulator(object):
if sub:
mergeSequences(sub, c )
else:
- self._msg.debug(" Merging sequence %s to a sequnece %s" % ( c.name(), dest.name() ) )
+ self._msg.debug(" Merging sequence %s to a sequence %s", c.name(), dest.name() )
dest += c
else: # an algorithm
existingAlg = findAlgorithm( dest, c.name(), depth=1 )
@@ -293,7 +289,7 @@ class ComponentAccumulator(object):
if existingAlg != c: # if it is the same we can just skip it, else this indicates an error
raise ConfigurationError( "Duplicate algorithm %s in source and destination sequences %s" % ( c.name(), src.name() ) )
else: # absent, adding
- self._msg.debug(" Merging algorithm %s to a sequnece %s" % ( c.name(), dest.name() ) )
+ self._msg.debug(" Merging algorithm %s to a sequnece %s", c.name(), dest.name() )
dest += c
@@ -350,7 +346,7 @@ class ComponentAccumulator(object):
del kwargs['sequence']
CurrentSequence.set( seq )
- self._msg.info("Executing configuration function %s" % fct.__name__)
+ self._msg.info("Executing configuration function %s", fct.__name__)
retval=fct(configFlags,*args,**kwargs)
CurrentSequence.set( currentSeq )
@@ -396,7 +392,6 @@ class ComponentAccumulator(object):
def store(self,outfile,nEvents=10):
from AthenaCommon.Utils.unixtools import find_datafile
- from collections import defaultdict
import pickle
import glob
# first load basics from the bootstrap-pickle
@@ -480,7 +475,10 @@ if __name__ == "__main__":
# trivial case without any nested sequences
from AthenaCommon.Configurable import ConfigurablePyAlgorithm # guinea pig algorithms
from AthenaCommon.CFElements import *
- cfgLogMsg.setLevel("debug")
+ from AthenaCommon.Logging import log
+ from AthenaCommon.Constants import DEBUG
+
+ log.setLevel(DEBUG)
dummyCfgFlags=AthConfigFlags()
dummyCfgFlags.lock()
diff --git a/Control/AthenaConfiguration/share/ComponentAccumulatorTest.ref b/Control/AthenaConfiguration/share/ComponentAccumulatorTest.ref
index 70f7395a805c4c92e52ef4f802ce75fec55ffadd..6b71c6a4d7596fd2cbfb2268150cce84b46c8d47 100644
--- a/Control/AthenaConfiguration/share/ComponentAccumulatorTest.ref
+++ b/Control/AthenaConfiguration/share/ComponentAccumulatorTest.ref
@@ -1,72 +1,72 @@
-ComponentAccumulator.py:addConfig INFO Executing configuration function AlgsConf2
-ComponentAccumulator.py:addConfig INFO Executing configuration function AlgsConf1
-ComponentAccumulator.py:addEventAlgo DEBUG Adding Algo/Algo1 to sequence AthAlgSeq
-ComponentAccumulator.py:addEventAlgo DEBUG Adding Algo/Algo2 to sequence AthAlgSeq
-ComponentAccumulator.py:addEventAlgo DEBUG Adding Algo/Algo3 to sequence AthAlgSeq
+Py:ComponentAccumulator INFO Executing configuration function AlgsConf2
+Py:ComponentAccumulator INFO Executing configuration function AlgsConf1
+Py:ComponentAccumulator DEBUG Adding Algo/Algo1 to sequence AthAlgSeq
+Py:ComponentAccumulator DEBUG Adding Algo/Algo2 to sequence AthAlgSeq
+Py:ComponentAccumulator DEBUG Adding Algo/Algo3 to sequence AthAlgSeq
Simple Configuration construction OK
-ComponentAccumulator.py:addConfig INFO Executing configuration function AlgsConf4
-ComponentAccumulator.py:addConfig INFO Executing configuration function AlgsConf3
-ComponentAccumulator.py:addEventAlgo DEBUG Adding Algo/NestedAlgo1 to sequence sub2Sequence1
-ComponentAccumulator.py:addEventAlgo DEBUG Adding Algo/NestedAlgo2 to sequence sub2Sequence1
+Py:ComponentAccumulator INFO Executing configuration function AlgsConf4
+Py:ComponentAccumulator INFO Executing configuration function AlgsConf3
+Py:ComponentAccumulator DEBUG Adding Algo/NestedAlgo1 to sequence sub2Sequence1
+Py:ComponentAccumulator DEBUG Adding Algo/NestedAlgo2 to sequence sub2Sequence1
Complex sequences construction also OK
-ComponentAccumulator.py:printConfig INFO Event Inputs
-ComponentAccumulator.py:printConfig INFO set([])
-ComponentAccumulator.py:printConfig INFO Event Algorithm Sequences
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ AthAlgSeq (seq: PAR AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ Algo1 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ Algo2 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ Algo3 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ Nest (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ subSequence1 (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ sub2Sequence1 (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ NestedAlgo1 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ NestedAlgo2 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ sub3Sequence1 (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ sub4Sequence1 (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ subSequence2 (seq: PAR OR)
-ComponentAccumulator.py:printConfig INFO Conditions Inputs
-ComponentAccumulator.py:printConfig INFO set([])
-ComponentAccumulator.py:printConfig INFO Condition Algorithms
-ComponentAccumulator.py:printConfig INFO []
-ComponentAccumulator.py:printConfig INFO Services
-ComponentAccumulator.py:printConfig INFO []
-ComponentAccumulator.py:printConfig INFO Outputs
-ComponentAccumulator.py:printConfig INFO {}
-ComponentAccumulator.py:addConfig INFO Executing configuration function AlgsConf2
-ComponentAccumulator.py:addConfig INFO Executing configuration function AlgsConf1
-ComponentAccumulator.py:addEventAlgo DEBUG Adding Algo/Algo1 to sequence hltTop
-ComponentAccumulator.py:addEventAlgo DEBUG Adding Algo/Algo2 to sequence hltTop
-ComponentAccumulator.py:addEventAlgo DEBUG Adding Algo/Algo3 to sequence hltTop
-ComponentAccumulator.py:printConfig INFO Event Inputs
-ComponentAccumulator.py:printConfig INFO set([])
-ComponentAccumulator.py:printConfig INFO Event Algorithm Sequences
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ AthAlgSeq (seq: PAR AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ Algo1 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ Algo2 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ Algo3 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ Nest (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ subSequence1 (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ sub2Sequence1 (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ NestedAlgo1 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ NestedAlgo2 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ sub3Sequence1 (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ sub4Sequence1 (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ subSequence2 (seq: PAR OR)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ hltTop (seq: SEQ OR)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ Algo1 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ Algo2 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ Algo3 (alg)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ hltSteps (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ hltStep_1 (seq: PAR OR)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ L2CaloEgammaSeq (seq: SEQ AND)
-ComponentAccumulator.py:printSeqAndAlgs INFO \__ hltStep_2 (seq: PAR OR)
-ComponentAccumulator.py:printConfig INFO Conditions Inputs
-ComponentAccumulator.py:printConfig INFO set([])
-ComponentAccumulator.py:printConfig INFO Condition Algorithms
-ComponentAccumulator.py:printConfig INFO []
-ComponentAccumulator.py:printConfig INFO Services
-ComponentAccumulator.py:printConfig INFO []
-ComponentAccumulator.py:printConfig INFO Outputs
-ComponentAccumulator.py:printConfig INFO {}
+Py:ComponentAccumulator INFO Event Inputs
+Py:ComponentAccumulator INFO set([])
+Py:ComponentAccumulator INFO Event Algorithm Sequences
+Py:ComponentAccumulator INFO \__ AthAlgSeq (seq: PAR AND)
+Py:ComponentAccumulator INFO \__ Algo1 (alg)
+Py:ComponentAccumulator INFO \__ Algo2 (alg)
+Py:ComponentAccumulator INFO \__ Algo3 (alg)
+Py:ComponentAccumulator INFO \__ Nest (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ subSequence1 (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ sub2Sequence1 (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ NestedAlgo1 (alg)
+Py:ComponentAccumulator INFO \__ NestedAlgo2 (alg)
+Py:ComponentAccumulator INFO \__ sub3Sequence1 (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ sub4Sequence1 (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ subSequence2 (seq: PAR OR)
+Py:ComponentAccumulator INFO Conditions Inputs
+Py:ComponentAccumulator INFO set([])
+Py:ComponentAccumulator INFO Condition Algorithms
+Py:ComponentAccumulator INFO []
+Py:ComponentAccumulator INFO Services
+Py:ComponentAccumulator INFO []
+Py:ComponentAccumulator INFO Outputs
+Py:ComponentAccumulator INFO {}
+Py:ComponentAccumulator INFO Executing configuration function AlgsConf2
+Py:ComponentAccumulator INFO Executing configuration function AlgsConf1
+Py:ComponentAccumulator DEBUG Adding Algo/Algo1 to sequence hltTop
+Py:ComponentAccumulator DEBUG Adding Algo/Algo2 to sequence hltTop
+Py:ComponentAccumulator DEBUG Adding Algo/Algo3 to sequence hltTop
+Py:ComponentAccumulator INFO Event Inputs
+Py:ComponentAccumulator INFO set([])
+Py:ComponentAccumulator INFO Event Algorithm Sequences
+Py:ComponentAccumulator INFO \__ AthAlgSeq (seq: PAR AND)
+Py:ComponentAccumulator INFO \__ Algo1 (alg)
+Py:ComponentAccumulator INFO \__ Algo2 (alg)
+Py:ComponentAccumulator INFO \__ Algo3 (alg)
+Py:ComponentAccumulator INFO \__ Nest (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ subSequence1 (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ sub2Sequence1 (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ NestedAlgo1 (alg)
+Py:ComponentAccumulator INFO \__ NestedAlgo2 (alg)
+Py:ComponentAccumulator INFO \__ sub3Sequence1 (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ sub4Sequence1 (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ subSequence2 (seq: PAR OR)
+Py:ComponentAccumulator INFO \__ hltTop (seq: SEQ OR)
+Py:ComponentAccumulator INFO \__ Algo1 (alg)
+Py:ComponentAccumulator INFO \__ Algo2 (alg)
+Py:ComponentAccumulator INFO \__ Algo3 (alg)
+Py:ComponentAccumulator INFO \__ hltSteps (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ hltStep_1 (seq: PAR OR)
+Py:ComponentAccumulator INFO \__ L2CaloEgammaSeq (seq: SEQ AND)
+Py:ComponentAccumulator INFO \__ hltStep_2 (seq: PAR OR)
+Py:ComponentAccumulator INFO Conditions Inputs
+Py:ComponentAccumulator INFO set([])
+Py:ComponentAccumulator INFO Condition Algorithms
+Py:ComponentAccumulator INFO []
+Py:ComponentAccumulator INFO Services
+Py:ComponentAccumulator INFO []
+Py:ComponentAccumulator INFO Outputs
+Py:ComponentAccumulator INFO {}
All OK
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py
index 0132029e86f29ab5701cff17274ee1006b91fcd5..d60541ce266b1ec623c3e9c179c245ea2f902856 100755
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
from TrigConfigSvc.TrigConfigSvcConf import *
@@ -409,7 +409,7 @@ class SetupTrigConfigSvc:
def TrigConfigSvcCfg( flags ):
- from AthenaConfiguration.CfgLogMsg import cfgLogMsg
+ from AthenaCommon.Logging import log
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
acc = ComponentAccumulator()
@@ -418,7 +418,7 @@ def TrigConfigSvcCfg( flags ):
l1ConfigSvc = TrigConf__LVL1ConfigSvc( "LVL1ConfigSvc" )
l1XMLFile = findFileInXMLPATH(flags.get("Trigger.inputLVL1ConfigFile"))
- cfgLogMsg.debug( "LVL1ConfigSvc input file:"+l1XMLFile )
+ log.debug( "LVL1ConfigSvc input file:"+l1XMLFile )
l1ConfigSvc.XMLMenuFile = l1XMLFile
l1ConfigSvc.ConfigSource = "XML"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
index 45a997061fa4308f98ddf50a58dc63d9b6bc7b99..b77e663a9709829c554f6d897287c9548ee4c5f5 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/newJOtest.py
@@ -4,13 +4,11 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.AllConfigFlags import ConfigFlags
-from AthenaConfiguration.CfgLogMsg import cfgLogMsg
from AthenaCommon.CFElements import parOR, seqOR, seqAND, stepSeq
from AthenaCommon.AlgSequence import dumpMasterSequence
from AthenaCommon.AppMgr import theApp
#theApp.setup()
-cfgLogMsg.setLevel("debug")
flags = ConfigFlags
flags.set( "global.isMC", False )