diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py index 395e6743ff7b8a8254460e527ffae3086bdda809..ba801404cd5ac48c26042c237c35dd9c299445cb 100755 --- a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py +++ b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.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 # TrigMuonEF configurables # @@ -84,14 +84,7 @@ def TMEF_Extrapolator(name='TMEF_Extrapolator',**kwargs): return CfgMgr.Trk__Extrapolator(name,**kwargs) -def TMEF_CaloEnergyMeas(name='TMEF_CaloEnergyMeas',**kwargs): - kwargs.setdefault("CaloNoiseTool","") - kwargs.setdefault("UseCaloNoiseTool",False) - return CfgMgr.Rec__MuidCaloEnergyMeas(name,**kwargs) - - def TMEF_CaloEnergyTool(name='TMEF_CaloEnergyTool', **kwargs): - kwargs.setdefault("CaloMeasTool","TMEF_CaloEnergyMeas") kwargs.setdefault("EnergyLossMeasurement",False) kwargs.setdefault("MopParametrization",True) return CfgMgr.Rec__MuidCaloEnergyTool(name,**kwargs) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py index 58e0938fca662227d3132c92ea35489a1c79e56e..d5b0a2f752a562c12a1016a414a74747910e0e13 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py @@ -617,8 +617,7 @@ def muEFCBRecoSequence( RoIs, name ): theIndetCandidateAlg = CfgMgr.MuonCombinedInDetCandidateAlg("TrigMuonCombinedInDetCandidateAlg_"+name,TrackSelector=getPublicTool("MuonCombinedInDetDetailedTrackSelectorTool"),TrackParticleLocation = [trackParticles],ForwardParticleLocation=trackParticles, MuonSystemExtensionTool=muonExtTool) #MuonCombinedCandidates - theCaloMeasTool = getPublicToolClone("TrigCaloMeasTool_"+name, "MuidCaloEnergyMeas", CaloNoiseTool="", UseCaloNoiseTool=False,CellContainerLocation="") - theCaloEnergyTool = getPublicToolClone("TrigCaloEnergyTool_"+name, "MuidCaloEnergyTool", CaloMeasTool = theCaloMeasTool, EnergyLossMeasurement=False, MopParametrization=True, TrackIsolation=False) + theCaloEnergyTool = getPublicToolClone("TrigCaloEnergyTool_"+name, "MuidCaloEnergyTool", EnergyLossMeasurement=False, MopParametrization=True, TrackIsolation=False) from TrkExRungeKuttaIntersector.TrkExRungeKuttaIntersectorConf import Trk__IntersectorWrapper as Propagator TrigMuonPropagator = Propagator(name = 'TrigMuonPropagator')