diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoConfig.py b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoConfig.py index 35a350abe19125ec1ce6de0233037b33158b258e..e98178e5abe66a08b0be4bbdd404454973367745 100644 --- a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoConfig.py +++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoConfig.py @@ -1,5 +1,5 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration # Authors: joao victor pinto <jodafons@cern.ch> @@ -35,8 +35,8 @@ class TrigL2CaloRingerFex( TrigL2CaloRingerFexBase ): super( TrigL2CaloRingerFex, self ).__init__( name ) from AthenaCommon.AppMgr import ToolSvc - from LumiBlockComps.LuminosityToolDefault import LuminosityToolOnline - ToolSvc += LuminosityToolOnline() + from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgOnlineDefault + LuminosityCondAlgOnlineDefault() pconstants,pthresholds=_GetPath(trigType,IDinfo) #if this is empty, the fex will work like EtCut self.CalibPath =pconstants diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py index 367e58ace837e73aaa89f112314c3093d43c350b..efd30e2fbe596f6820a75da31b7195aa798945af 100644 --- a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py +++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration import re _pattern = "(?P<mult>\d*)(e(?P<threshold1>\d+))(e(?P<threshold2>\d+))*" @@ -110,8 +110,8 @@ def createRingerDecisions( name, chains, ClustersKey="CaloClusters",RingerKey="C from AthenaCommon.Constants import INFO tool = _AlgTool(name) from AthenaCommon.AppMgr import ToolSvc - from LumiBlockComps.LuminosityToolDefault import LuminosityToolOnline - ToolSvc+=LuminosityToolOnline() + from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgOnlineDefault + LuminosityCondAlgOnlineDefault() if not type(chains) is list: chains=[chains]