diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py
index 2b3d3de7b5bc9227e057e6e653a21527c2c9b811..a1b5f7615e29cfd078d2ca2f17b1dbd166d86e7a 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py
@@ -35,13 +35,19 @@ def TrackEnergyInCaloTool( name ='TrackEnergyInCaloTool', **kwargs ):
return CfgMgr.TrackEnergyInCaloTool(name,**kwargs)
def TrackDepositInCaloTool( name ='TrackDepositInCaloTool', **kwargs ):
+ from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
+ from TrackToCalo.TrackToCaloConf import Rec__ParticleCaloCellAssociationTool
+ caloCellAssociationTool = Rec__ParticleCaloCellAssociationTool(ParticleCaloExtensionTool = getPublicTool("MuonParticleCaloExtensionTool"))
+ kwargs.setdefault("ExtrapolatorHandle", AtlasExtrapolator() )
+ kwargs.setdefault("ParticleCaloExtensionTool", MuonParticleCaloExtensionTool )
+ kwargs.setdefault("ParticleCaloCellAssociationTool", caloCellAssociationTool )
return CfgMgr.TrackDepositInCaloTool(name,**kwargs)
def CaloMuonLikelihoodTool(name='CaloMuonLikelihoodTool', **kwargs ):
kwargs.setdefault("TrackEnergyInCaloTool", getPublicTool("TrackEnergyInCaloTool") )
return CfgMgr.CaloMuonLikelihoodTool(name,**kwargs)
-def MuonCaloTagTool( name='MuonCaloTagTool', **kwargs ):
+def MuonCaloTagTool( name='MuonCaloTagTool', **kwargs ):
from CaloTrkMuIdTools.CaloTrkMuIdToolsConf import CaloMuonTag as ConfiguredCaloMuonTag
CaloMuonTagLoose = ConfiguredCaloMuonTag(name = "CaloMuonTagLoose")
CaloMuonTagLoose.TagMode="Loose"
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
index 122c50317c3d4ea62afe780d8211f45e2fde721a..021710e832bbc1d285b4e0eb9a5cfc684f26cf7e 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
@@ -64,15 +64,7 @@ def MuonCombinedInDetCandidateAlg( name="MuonCombinedInDetCandidateAlg",**kwargs
kwargs.setdefault("DoSiliconAssocForwardMuons", True )
kwargs.setdefault("InDetForwardTrackSelector", getPublicTool("MuonCombinedInDetDetailedForwardTrackSelectorTool") )
- from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
- from TrackToCalo.TrackToCaloConf import Trk__ParticleCaloExtensionTool
-
- from MuonTGRecTools.MuonTGRecToolsConf import Muon__MuonSystemExtensionTool
- pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = AtlasExtrapolator())
-
- muonExtTool = Muon__MuonSystemExtensionTool(Extrapolator = AtlasExtrapolator(),
- ParticleCaloExtensionTool = pcExtensionTool)
- kwargs.setdefault("MuonSystemExtensionTool", muonExtTool)
+ kwargs.setdefault("MuonSystemExtensionTool", getPublicTool("MuonSystemExtensionTool"))
return CfgMgr.MuonCombinedInDetCandidateAlg(name,**kwargs)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
index 79863eff8b0deaa99062008a216c3accaa89544b..85904b5d81135c870a0f430b671d0b0f18cf3131 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedFitTools.py
@@ -182,23 +182,24 @@ def MuidSegmentRegionRecoveryTool( name ='MuidSegmentRegionRecoveryTool', **kwar
kwargs.setdefault("Fitter", getPublicTool("CombinedMuonTrackBuilderFit") )
return CfgMgr.Muon__MuonSegmentRegionRecoveryTool(name,**kwargs)
-from AthenaCommon.AppMgr import ToolSvc
-
-def CombinedMuonTrackBuilderFit( name='CombinedMuonTrackBuilderFit', **kwargs ):
- import MuonCombinedRecExample.CombinedMuonTrackSummary
- from AthenaCommon.AppMgr import ToolSvc
+
+def MuonMaterialProviderTool( name = "MuonMaterialProviderTool"):
from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
from TrackToCalo.TrackToCaloConf import Trk__ParticleCaloExtensionTool, Rec__MuonCaloEnergyTool, Rec__ParticleCaloCellAssociationTool
from TrkMaterialProvider.TrkMaterialProviderConf import Trk__TrkMaterialProviderTool
-
- pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = AtlasExtrapolator())
caloCellAssociationTool = Rec__ParticleCaloCellAssociationTool(ParticleCaloExtensionTool = pcExtensionTool)
- muonCaloEnergyTool = Rec__MuonCaloEnergyTool(ParticleCaloExtensionTool = pcExtensionTool,
+ ToolSvc += caloCellAssociationTool
+
+ muonCaloEnergyTool = Rec__MuonCaloEnergyTool(ParticleCaloExtensionTool = getPublicTool("MuonParticleCaloExtensionTool"),
ParticleCaloCellAssociationTool = caloCellAssociationTool)
+ ToolSvc += muonCaloEnergyTool
materialProviderTool = Trk__TrkMaterialProviderTool(MuonCaloEnergyTool = muonCaloEnergyTool);
- ToolSvc += materialProviderTool
+ return materialProviderTool
+def CombinedMuonTrackBuilderFit( name='CombinedMuonTrackBuilderFit', **kwargs ):
+ import MuonCombinedRecExample.CombinedMuonTrackSummary
+ from AthenaCommon.AppMgr import ToolSvc
kwargs.setdefault("CaloEnergyParam" , getPublicTool("MuidCaloEnergyToolParam") )
kwargs.setdefault("CaloTSOS" , getPublicTool("MuidCaloTrackStateOnSurface") )
kwargs.setdefault("CscRotCreator" , getPublicTool("CscClusterOnTrackCreator") )
@@ -222,7 +223,7 @@ def CombinedMuonTrackBuilderFit( name='CombinedMuonTrackBuilderFit', **kwargs ):
kwargs.setdefault("Vertex3DSigmaZ" , 60.*mm)
kwargs.setdefault("TrackSummaryTool" , ToolSvc.CombinedMuonTrackSummary )
kwargs.setdefault("UseCaloTG" , False )
- kwargs.setdefault("CaloMaterialProvider" , materialProviderTool)
+ kwargs.setdefault("CaloMaterialProvider" , getPublicTool("MuonMaterialProviderTool"))
if beamFlags.beamType() == 'cosmics':
kwargs.setdefault("MdtRotCreator" , "" )
@@ -240,19 +241,6 @@ def CombinedMuonTrackBuilderFit( name='CombinedMuonTrackBuilderFit', **kwargs ):
def CombinedMuonTrackBuilder( name='CombinedMuonTrackBuilder', **kwargs ):
import MuonCombinedRecExample.CombinedMuonTrackSummary
- from AthenaCommon.AppMgr import ToolSvc
- from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
- from TrackToCalo.TrackToCaloConf import Trk__ParticleCaloExtensionTool, Rec__MuonCaloEnergyTool, Rec__ParticleCaloCellAssociationTool
- from TrkMaterialProvider.TrkMaterialProviderConf import Trk__TrkMaterialProviderTool
-
- pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = AtlasExtrapolator())
- caloCellAssociationTool = Rec__ParticleCaloCellAssociationTool(ParticleCaloExtensionTool = pcExtensionTool)
- muonCaloEnergyTool = Rec__MuonCaloEnergyTool(ParticleCaloExtensionTool = pcExtensionTool,
- ParticleCaloCellAssociationTool = caloCellAssociationTool)
-
- materialProviderTool = Trk__TrkMaterialProviderTool(MuonCaloEnergyTool = muonCaloEnergyTool);
- ToolSvc += materialProviderTool
-
kwargs.setdefault("CaloEnergyParam" , getPublicTool("MuidCaloEnergyToolParam") )
kwargs.setdefault("CaloTSOS" , getPublicTool("MuidCaloTrackStateOnSurface") )
kwargs.setdefault("CscRotCreator" , getPublicTool("CscClusterOnTrackCreator") )
@@ -277,7 +265,7 @@ def CombinedMuonTrackBuilder( name='CombinedMuonTrackBuilder', **kwargs ):
kwargs.setdefault("Vertex3DSigmaZ" , 60.*mm)
kwargs.setdefault("TrackSummaryTool" , ToolSvc.CombinedMuonTrackSummary )
kwargs.setdefault("UseCaloTG" , True ) #
- kwargs.setdefault("CaloMaterialProvider" , materialProviderTool)
+ kwargs.setdefault("CaloMaterialProvider" , getPublicTool("MuonMaterialProviderTool"))
if beamFlags.beamType() == 'cosmics':
kwargs.setdefault("MdtRotCreator" , "" )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
index 1166244b13cc154ba4ef0491bfd5eddd3032715b..fbf0e345316769dabd3a1cacd7b996135391dc6b 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
@@ -8,7 +8,6 @@ from AthenaCommon.CfgGetter import addTool, addToolClone, addService, addAlgorit
from AthenaCommon.Constants import * # FATAL,ERROR etc.
-
# combined tools
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCombinedTool","MuonCombinedTool")
addTool("MuonCombinedRecExample.MuonCombinedTools.InDetCandidateTool","InDetCandidateTool")
@@ -31,20 +30,14 @@ addTool("MuonCombinedRecExample.MuGirlTagTool.CombinedStauTrackBuilder",'Combine
addTool("MuonCombinedRecExample.MuGirlTagTool.MuonStauCandidateTrackBuilderTool","MuonStauCandidateTrackBuilderTool")
addTool("MuonCombinedRecExample.MuGirlTagTool.MuonStauInsideOutRecoTool","MuonStauInsideOutRecoTool")
addTool("MuonCombinedRecExample.MuGirlTagTool.MuonStauRecoTool","MuonStauRecoTool")
-
-
-from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
-from TrackToCalo.TrackToCaloConf import Trk__ParticleCaloExtensionTool, Rec__ParticleCaloCellAssociationTool
-
-pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = AtlasExtrapolator())
-caloCellAssociationTool = Rec__ParticleCaloCellAssociationTool(ParticleCaloExtensionTool = pcExtensionTool)
-
-addTool("MuonCombined::MuonCombinedStacoTagTool","MuonCombinedStacoTagTool", ParticleCaloExtensionTool = pcExtensionTool)
addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCombinedFitTagTool","MuonCombinedFitTagTool")
+addTool("MuonCombinedRecExample.MuonCombinedTools.MuonCombinedStacoTagTool","MuonCombinedStacoTagTool")
addTool("Trk::TrackParticleCreatorTool","TrackParticleCreatorTool")
addTool("MuonCombinedRecExample.MuonCaloTagTool.MuonCaloTagTool","MuonCaloTagTool")
addTool("Rec::MuonMomentumBalanceSignificanceTool","MuonMomentumBalanceSignificanceTool")
addTool("Rec::MuonScatteringAngleSignificanceTool","MuonScatteringAngleSignificanceTool")
+addTool( "Muon::MuonSystemExtensionTool", "MuonSystemExtensionTool", ParticleCaloExtensionTool = "ParticleCaloExtensionTool", Extrapolator = "AtlasExtrapolator")
+addTool("MuonCombinedRecExample.MuonCombinedFitTools.MuonMaterialProviderTool","MuonMaterialProviderTool")
addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuGirlAlg","MuGirlAlg")
addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.MuonCaloTagAlg","MuonCaloTagAlg")
@@ -60,6 +53,7 @@ addAlgorithm("MuonCombinedRecExample.MuonCombinedAlgs.StauCreatorAlg","StauCreat
# tracking tools
addTool("TrkTrackSummaryTool.AtlasTrackSummaryTool.AtlasTrackSummaryTool", "AtlasTrackSummaryTool" )
+addTool("Trk::ParticleCaloExtensionTool", "MuonParticleCaloExtensionTool", Extrapolator = "AtlasExtrapolator")
# put this here until it is set in the appropriate package
addTool("MuonCombinedRecExample.MuonSegmentTaggerTools.MuTagMatchingTool","MuTagMatchingTool")
@@ -87,10 +81,7 @@ addTool("MuonCombinedRecExample.MuonCombinedFitTools.OutwardsSegmentRegionRecove
####### calo tag
addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloTrkMuIdAlgTrackSelectorTool","CaloTrkMuIdAlgTrackSelectorTool")
addTool("MuonCombinedRecExample.MuonCaloTagTool.TrackEnergyInCaloTool","TrackEnergyInCaloTool")
-addTool("MuonCombinedRecExample.MuonCaloTagTool.TrackDepositInCaloTool","TrackDepositInCaloTool",
- ExtrapolatorHandle=AtlasExtrapolator(),
- ParticleCaloExtensionTool=pcExtensionTool,
- ParticleCaloCellAssociationTool=caloCellAssociationTool)
+addTool("MuonCombinedRecExample.MuonCaloTagTool.TrackDepositInCaloTool","TrackDepositInCaloTool")
addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonTagLoose","CaloMuonTagLoose")
addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonTag","CaloMuonTag")
addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonLikelihoodTool","CaloMuonLikelihoodTool")
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
index 83c177b13dc8133e64f8e94786e9a9906f893cb1..61efa8401b990982d9a3ff04142ff4dbc7db775d 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedTools.py
@@ -76,19 +76,7 @@ def InDetCandidateTool(name="InDetCandidateTool",**kwargs ):
return CfgMgr.MuonCombined__InDetCandidateTool(name,**kwargs)
def MuonCreatorTool(name="MuonCreatorTool",**kwargs):
- from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
- from TrackToCalo.TrackToCaloConf import Trk__ParticleCaloExtensionTool, Rec__MuonCaloEnergyTool, Rec__ParticleCaloCellAssociationTool
- from TrkMaterialProvider.TrkMaterialProviderConf import Trk__TrkMaterialProviderTool
-
- pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = AtlasExtrapolator())
- kwargs.setdefault("ParticleCaloExtensionTool", pcExtensionTool)
-
- caloCellAssociationTool = Rec__ParticleCaloCellAssociationTool(ParticleCaloExtensionTool = pcExtensionTool)
- muonCaloEnergyTool = Rec__MuonCaloEnergyTool(ParticleCaloExtensionTool = pcExtensionTool,
- ParticleCaloCellAssociationTool = caloCellAssociationTool)
-
- materialProviderTool = Trk__TrkMaterialProviderTool(MuonCaloEnergyTool = muonCaloEnergyTool);
- kwargs.setdefault("CaloMaterialProvider", materialProviderTool)
+ kwargs.setdefault("CaloMaterialProvider", getPublicTool("MuonMaterialProviderTool"))
getPublicTool("MuonMomentumBalanceSignificanceTool")
getPublicTool("MuonScatteringAngleSignificanceTool")
@@ -120,4 +108,8 @@ def MuonCombinedFitTagTool(name="MuonCombinedFitTagTool",**kwargs):
kwargs.setdefault("MatchQuality", getPublicTool("MuonMatchQuality") )
return CfgMgr.MuonCombined__MuonCombinedFitTagTool(name,**kwargs)
-
+def MuonCombinedStacoTagTool(name="MuonCombinedStacoTagTool",**kwargs):
+ kwargs.setdefault("ParticleCaloExtensionTool", getPublicTool("MuonParticleCaloExtensionTool") )
+
+ return CfgMgr.MuonCombined__MuonCombinedStacoTagTool(name,**kwargs)
+
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonSegmentTaggerTools.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonSegmentTaggerTools.py
index 57ba53d26a2d8dd4cbc697be3269c47dff8bbc2a..347d51cb61a10b12815e65370c472844dbbfde30 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonSegmentTaggerTools.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonSegmentTaggerTools.py
@@ -31,10 +31,7 @@ def MuTagAmbiguitySolverTool(name='MuTagAmbiguitySolverTool', **kwargs ):
def MuonSegmentTagTool( name="MuonSegmentTagTool", **kwargs ):
- from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
- from TrackToCalo.TrackToCaloConf import Trk__ParticleCaloExtensionTool
- pcExtensionTool = Trk__ParticleCaloExtensionTool(Extrapolator = AtlasExtrapolator())
- kwargs.setdefault("ParticleCaloExtensionTool", pcExtensionTool)
+ kwargs.setdefault("ParticleCaloExtensionTool", getPublicTool("MuonParticleCaloExtensionTool"))
kwargs.setdefault("MuTagMatchingTool", getPublicTool("MuTagMatchingTool") )
kwargs.setdefault("MuTagAmbiguitySolverTool", getPublicTool("MuTagAmbiguitySolverTool") )
return CfgMgr.MuonCombined__MuonSegmentTagTool(name,**kwargs)