Merge branch 'lumiCondAlg.TrigMultiVarHypo-20190703' into 'master'

TrigMultiVarHypo: Configure LuminosityCondAlg instead of LuminosityTool.

See merge request atlas/athena!24597

Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoConfig.py

 
-# 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

Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py

-# 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]