diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py index a1603a63f1b97239d88cebfcb802a0834be482f6..43495573eda5245031d59a28f961414364d2eaca 100644 --- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py +++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py @@ -174,15 +174,12 @@ def getL1ConfigSvc( flags = None ): log = logging.getLogger('TrigConfigSvcCfg') from AthenaCommon.Logging import log from TriggerJobOpts.TriggerFlags import TriggerFlags - from AthenaCommon.Configurable import Configurable - print("HERE importing as {}".format(Configurable.configurableRun3Behavior)) # generate menu file generatedFile = generateL1Menu( flags=flags ) # configure config svc - TrigConf__LVL1ConfigSvc = CompFactory.getComp("TrigConf::LVL1ConfigSvc") - l1ConfigSvc = TrigConf__LVL1ConfigSvc( "LVL1ConfigSvc" ) + l1ConfigSvc = CompFactory.TrigConf.LVL1ConfigSvc("LVL1ConfigSvc") l1ConfigSvc.ConfigSource = "XML" l1XMLFile = TriggerFlags.inputLVL1configFile() if flags is None else flags.Trigger.LVL1ConfigFile @@ -213,8 +210,7 @@ def getL1ConfigSvc( flags = None ): @memoize def getHLTConfigSvc( flags = None ): log = logging.getLogger('TrigConfigSvcCfg') - HLTConfigSvc = CompFactory.getComp("TrigConf::HLTConfigSvc") - hltConfigSvc = HLTConfigSvc("HLTConfigSvc") + hltConfigSvc = CompFactory.TrigConf.HLTConfigSvc("HLTConfigSvc") hltXMLFile = "None" hltConfigSvc.ConfigSource = "None" @@ -234,8 +230,7 @@ def getHLTConfigSvc( flags = None ): @memoize def setupHLTPrescaleCondAlg( flags = None ): log = logging.getLogger('TrigConfigSvcCfg') - TrigConf__HLTPrescaleCondAlg = CompFactory.getComp("TrigConf::HLTPrescaleCondAlg") - hltPrescaleCondAlg = TrigConf__HLTPrescaleCondAlg( "HLTPrescaleCondAlg" ) + hltPrescaleCondAlg = CompFactory.TrigConf.HLTPrescaleCondAlg("HLTPrescaleCondAlg") tc = getTrigConfigFromFlag( flags ) hltPrescaleCondAlg.Source = tc["source"]