diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
index f207e4a4a1ac79347ad68506b718e9a331ca0a40..93ba014ef2dee8999feef53db0b71c46cf7d397e 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
@@ -319,23 +319,6 @@ def MuidTrackCleanerCfg(flags, name='MuidTrackCleaner', **kwargs ):
tool = CompFactory.Muon__MuonTrackCleaner(name,**kwargs)
result.setPrivateTools(tool)
return result
-
-def OutwardsTrackCleanerCfg( flags, name='OutwardsTrackCleaner', **kwargs ):
- if flags.Beam.Type == 'cosmics':
- kwargs.setdefault("PullCut" , 5.0)
- kwargs.setdefault("PullCutPhi" , 10.0)
- else:
- kwargs.setdefault("PullCut" , 4.0)
- kwargs.setdefault("PullCutPhi" , 4.0)
- result = iPatFitterCfg(flags)
- kwargs.setdefault("Fitter" , result.popPrivateTools() )
- acc= iPatSLFitterCfg(flags)
- kwargs.setdefault("SLFitter" , acc.popPrivateTools() )
- result.merge(acc)
-
- tool = CompFactory.Muon__MuonTrackCleaner(name,**kwargs)
- result.setPrivateTools(tool)
- return result
def MuidCaloEnergyParam(flags, name='MuidCaloEnergyParam', **kwargs ):
kwargs.setdefault("Cosmics", flags.Beam.Type == 'cosmics' )
@@ -659,45 +642,6 @@ def CombinedMuonTagTestToolCfg(flags, name='CombinedMuonTagTestTool', **kwargs )
result.setPrivateTools(tool)
return result
-
-def OutwardsSegmentRegionRecoveryToolCfg(flags, name ='OutwardsSegmentRegionRecoveryTool', **kwargs ):
- result = MuonCombinedTrackFitterCfg(flags)
- kwargs.setdefault("Fitter", result.popPrivateTools() )
- tool = CompFactory.Muon__MuonSegmentRegionRecoveryTool(name,**kwargs)
- result.setPrivateTools(tool)
- return result
-
-def OutwardsCombinedMuonTrackBuilderCfg(flags, name = 'OutwardsCombinedMuonTrackBuilder', **kwargs ):
- result = OutwardsTrackCleanerCfg(flags)
- kwargs.setdefault("Cleaner", result.popPrivateTools())
- acc = MuonCombinedTrackFitterCfg(flags)
- fitter = acc.popPrivateTools() # Might be needed below
- kwargs.setdefault("Fitter", fitter )
- result.merge(acc)
- acc = MuonCombinedTrackSummaryToolCfg(flags)
- kwargs.setdefault("TrackSummaryTool" , acc.popPrivateTools() )
- result.merge(acc)
- acc = OutwardsSegmentRegionRecoveryToolCfg(flags)
- kwargs.setdefault("MuonHoleRecovery" , acc.popPrivateTools() )
- result.merge(acc)
- kwargs.setdefault("AllowCleanerVeto" , False)
- if flags.Muon.enableErrorTuning():
- from MuonConfig.MuonRecToolsConfig import MuonRefitToolCfg
- acc = MuonRefitToolCfg(flags, name="OutwardsRefitTool", AlignmentErrors = False, Fitter = fitter)
- refitTool = acc.popPrivateTools()
- result.merge(acc)
- acc = MuidErrorOptimisationToolCfg(flags, name="OutwardsErrorOptimisationTool", PrepareForFit = False,
- RecreateStartingParameters = False, RefitTool = refitTool)
- kwargs.setdefault("MuonErrorOptimizer", acc.popPrivateTools())
- result.merge(acc)
-
-
- tool = CompFactory.Rec__OutwardsCombinedMuonTrackBuilder(name,**kwargs)
- result.setPrivateTools(tool)
- return result
-
- # tools for ID/MS match quality and recovery of incorrect spectrometer station association
-
# From MuonCaloTagTool.py
def CaloTrkMuIdAlgTrackSelectorToolCfg(flags, name='CaloTrkMuIdAlgTrackSelectorTool', **kwargs ):
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
index 3f69717d6afd8f71687e222ce6c75e1167f504b0..005c51c85a299f2dfccf567f4ab419d7ee8f2baf 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
@@ -77,18 +77,6 @@ def MuidTrackCleaner( name='MuidTrackCleaner', **kwargs ):
kwargs.setdefault("SLFitter" , getPublicTool("iPatSLFitter") )
return CfgMgr.Muon__MuonTrackCleaner(name,**kwargs)
-def OutwardsTrackCleaner( name='OutwardsTrackCleaner', **kwargs ):
- if beamFlags.beamType() == 'cosmics':
- kwargs.setdefault("PullCut" , 5.0)
- kwargs.setdefault("PullCutPhi" , 10.0)
- else:
- kwargs.setdefault("PullCut" , 4.0)
- kwargs.setdefault("PullCutPhi" , 4.0)
-
- kwargs.setdefault("Fitter" , getPublicTool("MuonCombinedTrackFitter") )
- kwargs.setdefault("SLFitter" , getPublicTool("iPatSLFitter") )
- return CfgMgr.Muon__MuonTrackCleaner(name,**kwargs)
-
def MuidCaloEnergyParam( name='MuidCaloEnergyParam', **kwargs ):
if beamFlags.beamType() == 'cosmics':
@@ -374,27 +362,3 @@ def CombinedMuonTagTestTool( name='CombinedMuonTagTestTool', **kwargs ):
kwargs.setdefault("Chi2Cut",50000.)
return CfgMgr.MuonCombined__MuonTrackTagTestTool(name,**kwargs)
-
-def OutwardsSegmentRegionRecoveryTool( name ='OutwardsSegmentRegionRecoveryTool', **kwargs ):
- kwargs.setdefault("Fitter", getPublicTool("MuonCombinedTrackFitter") )
- import MuonCombinedRecExample.CombinedMuonTrackSummary
- from AthenaCommon.AppMgr import ToolSvc
- kwargs.setdefault("TrackSummaryTool", ToolSvc.CombinedMuonTrackSummary)
- return CfgMgr.Muon__MuonSegmentRegionRecoveryTool(name,**kwargs)
-
-def OutwardsCombinedMuonTrackBuilder( name = 'OutwardsCombinedMuonTrackBuilder', **kwargs ):
- import MuonCombinedRecExample.CombinedMuonTrackSummary
- from AthenaCommon.AppMgr import ToolSvc
- kwargs.setdefault("Cleaner", getPublicTool("OutwardsTrackCleaner") )
- kwargs.setdefault("Fitter", getPublicTool("MuonCombinedTrackFitter") )
- kwargs.setdefault("TrackSummaryTool" , ToolSvc.CombinedMuonTrackSummary )
- kwargs.setdefault("MuonHoleRecovery" , getPublicTool("OutwardsSegmentRegionRecoveryTool") )
- kwargs.setdefault("AllowCleanerVeto" , False)
- if muonRecFlags.enableErrorTuning():
- kwargs.setdefault("MuonErrorOptimizer", getPublicToolClone("OutwardsErrorOptimisationTool", "MuidErrorOptimisationTool",
- PrepareForFit=False,RecreateStartingParameters=False,
- RefitTool = getPublicToolClone("OutwardsRefitTool", "MuonRefitTool", AlignmentErrors = False, Fitter = getPublicTool("MuonCombinedTrackFitter"))
- ))
-
- return CfgMgr.Rec__OutwardsCombinedMuonTrackBuilder(name,**kwargs)
- # tools for ID/MS match quality and recovery of incorrect spectrometer station association
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_myTopOptions.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_myTopOptions.py
index 624217b20c118ad099f32b17e1f4f78bf521022b..4104dcbec8e98371cd88acaa98f17e4dd6a14252 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_myTopOptions.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_myTopOptions.py
@@ -328,7 +328,6 @@ try:
#topSequence.CombinedMuonTracksTruthAlg.OutputLevel = VERBOSE
#ToolSvc += CfgMgr.Trk__TrackParticleCaloExtensionTool("TrackParticleCaloExtensionTool",OutputLevel = VERBOSE)
#ToolSvc.MuonCombinedTrackFitter.OutputLevel = VERBOSE
- #ToolSvc.OutwardsTrackCleaner.OutputLevel = VERBOSE
#ToolSvc.MuidTrackCleaner.OutputLevel = VERBOSE
#ToolSvc += CfgMgr.Rec__MuidCaloMaterialParam("MuidCaloMaterialParam",OutputLevel = VERBOSE)
#ToolSvc += CfgMgr.Rec__MuidCaloTrackStateOnSurface("MuidCaloTrackStateOnSurface",OutputLevel = VERBOSE)
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
index ce873470474b61bebef8d4c69a23a38a1c35e209..b50f183c90d6304113140e97e6543f70ad6d5242 100755
--- a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
@@ -241,7 +241,6 @@ def TMEF_MatchMaker(name='TMEF_MatchMaker',**kwargs):
kwargs.setdefault("AmbiguityProcessor", "MuonAmbiProcessor")
kwargs.setdefault("MatchQuality", "TMEF_MatchQuality")
kwargs.setdefault("CaloTSOS", "TMEF_CaloTrackStateOnSurface") # not in Muid?
-# kwargs.setdefault("OutwardsTrackBuilder", "TMEF_OutwardsCombinedMuonTrackBuilder") # extra in Muid (not yet configured here)
kwargs.setdefault("TrackBuilder", "TMEF_CombinedMuonTrackBuilder")
kwargs.setdefault("TrackQuery", "TMEF_MuonTrackQuery")
kwargs.setdefault("Propagator", "TMEF_Propagator")
@@ -314,17 +313,6 @@ def TMEF_MuonCombinedPropagator(name='TMEF_MuonCombinedPropagator',**kwargs):
from TrkExRungeKuttaPropagator.TrkExRungeKuttaPropagatorConf import Trk__RungeKuttaPropagator
return Trk__RungeKuttaPropagator(name, **kwargs)
-def TMEF_OutwardsMuonTrackCleaner(name='TMEF_OutwardsMuonTrackCleaner',**kwargs):
- if TriggerFlags.run2Config=='2016':
- kwargs.setdefault('PullCut', 3.0)
- kwargs.setdefault('PullCutPhi', 3.0)
- else:
- kwargs.setdefault('PullCut', 4.0)
- kwargs.setdefault('PullCutPhi', 4.0)
- kwargs.setdefault('Fitter', 'TMEF_MuonCombinedTrackFitter')
- kwargs.setdefault('SLFitter', 'TMEF_iPatSLFitter')
- return CfgMgr.Muon__MuonTrackCleaner(name, **kwargs)
-
def TMEF_MuonCombinedTrackFitter(name='TMEF_MuonCombinedTrackFitter',**kwargs):
kwargs.setdefault('ExtrapolationTool', 'AtlasExtrapolator')#gpt
kwargs.setdefault('NavigatorTool', ToolSvc.MuonNavigator)
@@ -345,23 +333,11 @@ def TMEF_MuonCombinedTrackFitter(name='TMEF_MuonCombinedTrackFitter',**kwargs):
from TrkGlobalChi2Fitter.TrkGlobalChi2FitterConf import Trk__GlobalChi2Fitter
return Trk__GlobalChi2Fitter(name, **kwargs)
-def TMEF_OutwardsCombinedMuonTrackBuilder(name='TMEF_OutwardsCombinedMuonTrackBuilder',**kwargs):
- kwargs.setdefault('Cleaner', 'TMEF_OutwardsMuonTrackCleaner')
- kwargs.setdefault('Fitter', 'TMEF_MuonCombinedTrackFitter')
- kwargs.setdefault('TrackSummaryTool', 'TMEF_TrackSummaryTool')#gpt
- kwargs.setdefault('MuonHoleRecovery', 'MuonSegmentRegionRecoveryTool')#gpt
- kwargs.setdefault('AllowCleanerVeto', False)
- kwargs.setdefault("TrackQuery", "TMEF_MuonTrackQuery")
- from MuidTrackBuilder.MuidTrackBuilderConf import Rec__OutwardsCombinedMuonTrackBuilder
- return Rec__OutwardsCombinedMuonTrackBuilder(name, **kwargs)
-
def TMEF_MuonCombinedFitTagTool(name="TMEF_MuonCombinedFitTagTool",**kwargs):
kwargs.setdefault("TrackBuilder", 'TMEF_CombinedMuonTrackBuilder' )
if not TriggerFlags.run2Config == '2016':
- kwargs.setdefault("OutwardsTrackBuilder", '')
kwargs.setdefault("MuonRecovery", '' )
else:
- kwargs.setdefault("OutwardsTrackBuilder", 'TMEF_OutwardsCombinedMuonTrackBuilder')
kwargs.setdefault("MuonRecovery", 'TMEF_MuidMuonRecovery' )
kwargs.setdefault("TrackQuery", 'TMEF_MuonTrackQuery' )
kwargs.setdefault("MatchQuality", 'TMEF_MatchQuality' )