diff --git a/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py b/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
index def30ff6d7afcb0e844b5688809b4447662b0672..9f0140e7a8fc696224d2e93009a48abacf55775a 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
@@ -151,8 +151,15 @@ def MuonAlignmentCondAlgCfg(flags):
acc.merge(addFolders( flags, '/MUONALIGN/MDT/ASBUILTPARAMS', 'MUONALIGN_OFL', className='CondAttrListCollection'))
MuonAlign.ParlineFolders += ["/MUONALIGN/MDT/ASBUILTPARAMS"]
pass
-
acc.addCondAlgo(MuonAlign)
+
+ # This does not work as expected - breaks tests. So comment out for the moment, but it should still be fixed
+
+ # if flags.IOVDb.DatabaseInstance != 'COMP200' and \
+ # 'HLT' not in flags.IOVDb.GlobalTag and not flags.Common.isOnline:
+ # acc.merge(addFolders( flags, '/MUONALIGN/ERRS', 'MUONALIGN_OFL', className='CondAttrListCollection'))
+ # acc.addCondAlgo(CompFactory.MuonAlignmentErrorDbAlg("MuonAlignmentErrorDbAlg"))
+
return acc
def MuonDetectorCondAlgCfg(flags):
@@ -170,7 +177,7 @@ def MuonDetectorCondAlgCfg(flags):
return acc
-def MuonGeoModelCfg(flags):
+def MuonGeoModelCfg(flags, forceDisableAlignment=False):
acc=GeoModelCfg(flags)
gms=acc.getPrimary()
detTool = acc.popToolsAndMerge(MuonDetectorToolCfg(flags))
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
index 87e2d90aa1f74b16887f1fb8a7f0514f88b73443..5d8bfb94858375c4051355c494867195f2420dfe 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
@@ -100,7 +100,8 @@ def MuonTrackSummaryHelperToolCfg(flags, name="MuonTrackSummaryHelperTool", **kw
result.merge(acc)
- acc = MuonExtrapolatorCfg(flags)
+ from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+ acc = AtlasExtrapolatorCfg(flags)
extrap = acc.getPrimary()
acc.addPublicTool(extrap)
result.merge(acc)
@@ -162,6 +163,7 @@ def MuonAmbiProcessorCfg(flags, name="MuonAmbiProcessor", **kwargs):
def MuonTrackCleanerCfg(flags, name="MuonTrackCleaner", **kwargs):
Muon__MuonTrackCleaner=CompFactory.Muon.MuonTrackCleaner
from MuonConfig.MuonRIO_OnTrackCreatorConfig import MdtDriftCircleOnTrackCreatorCfg, TriggerChamberClusterOnTrackCreatorCfg
+ from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
# declareProperty("Helper",m_edmHelperSvc);
# declareProperty("Printer",m_printer);
# declareProperty("MdtRotCreator", m_mdtRotCreator );
@@ -184,7 +186,7 @@ def MuonTrackCleanerCfg(flags, name="MuonTrackCleaner", **kwargs):
# For PullCalculator, just let it get default for moment. FIXME
- extrapolator_CA = MuonExtrapolatorCfg(flags)
+ extrapolator_CA = AtlasExtrapolatorCfg(flags)
extrapolator = extrapolator_CA.getPrimary()
acc.addPublicTool( extrapolator ) # TODO remove
result.merge( extrapolator_CA )
@@ -259,7 +261,7 @@ def MuonExtrapolatorCfg(flags,name = "MuonExtrapolator", **kwargs):
mult_scat_updator = Trk__MultipleScatteringUpdator(name="AtlasMultipleScatteringUpdator")
result.addPublicTool(mult_scat_updator) # TODO remove
- material_effects_updator = Trk__MaterialEffectsUpdator( EnergyLossUpdator=energy_loss_updator, MultipleScatteringUpdator=mult_scat_updator)
+ material_effects_updator = Trk__MaterialEffectsUpdator( name="MuonMaterialEffectsUpdator", EnergyLossUpdator=energy_loss_updator, MultipleScatteringUpdator=mult_scat_updator)
result.addPublicTool(material_effects_updator)
kwargs.setdefault("MaterialEffectsUpdators", [material_effects_updator])
@@ -345,7 +347,7 @@ def MCTBExtrapolatorCfg(flags, name='MCTBExtrapolator',**kwargs):
result.merge(acc)
kwargs.setdefault("Propagators", [ prop ])
kwargs.setdefault("ResolveMuonStation", False)
- acc = MuonExtrapolatorCfg(flags, name=name)
+ acc = MuonExtrapolatorCfg(flags, name=name, **kwargs)
result.setPrivateTools(acc.getPrimary())
result.merge(acc)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
index 509f4c5275a97a8545975ddb04faafa2d6582bbc..b0d6d39e20114204ace6126a19ff27465556e10a 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
@@ -203,14 +203,14 @@ def MuonSegmentMatchingToolCfg(flags, name="MuonSegmentMatchingTool", **kwargs):
def MooCandidateMatchingToolCfg(flags, name="MooCandidateMatchingTool", doSegmentPhiMatching=False, **kwargs):
Muon__MooCandidateMatchingTool=CompFactory.Muon.MooCandidateMatchingTool
from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
- from MuonConfig.MuonRecToolsConfig import MuonExtrapolatorCfg
+ from MuonConfig.MuonRecToolsConfig import MuonStraightLineExtrapolatorCfg
result = ComponentAccumulator()
# Won't explicitly configure MuonEDMHelperSvc
kwargs.setdefault("MuonPrinterTool", MuonEDMPrinterTool(flags) )
- acc = MuonExtrapolatorCfg(flags, name="MuonStraightLineExtrapolator")
+ acc = MuonStraightLineExtrapolatorCfg(flags)
slextrap = acc.getPrimary()
result.merge(acc)
kwargs.setdefault("SLExtrapolator", slextrap)
diff --git a/MuonSpectrometer/MuonConfig/test/MdtIntersectGeometry_test.py b/MuonSpectrometer/MuonConfig/test/MdtIntersectGeometry_test.py
index 7059e4fd7621d77cf9e5fefef82f7e06740004e6..e62a25788a7e7f5a31daea92b42642f9da47e7a3 100644
--- a/MuonSpectrometer/MuonConfig/test/MdtIntersectGeometry_test.py
+++ b/MuonSpectrometer/MuonConfig/test/MdtIntersectGeometry_test.py
@@ -37,7 +37,7 @@ def testCfg (configFlags):
result = ComponentAccumulator()
from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
- result.merge (MuonGeoModelCfg(configFlags))
+ result.merge (MuonGeoModelCfg(configFlags, forceDisableAlignment=True))
from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg
result.merge (MagneticFieldSvcCfg(configFlags, UseDCS = False))
diff --git a/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py b/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py
index 21fa12ae9cc470636d1b886d9b1a0253187c9ffa..9ad3bb43518a67ed51aea0d48da33760589c1774 100644
--- a/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py
+++ b/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py
@@ -39,7 +39,7 @@ def testCfg (configFlags):
result = ComponentAccumulator()
from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
- result.merge (MuonGeoModelCfg(configFlags))
+ result.merge (MuonGeoModelCfg(configFlags, forceDisableAlignment=True))
from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg
result.merge (MagneticFieldSvcCfg(configFlags, UseDCS = False))
@@ -57,7 +57,6 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
ConfigFlags.Input.Files = defaultTestFiles.RAW
-
ConfigFlags.lock()
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
acc=MainServicesCfg(ConfigFlags)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
index 76b689a3e7632098313bbf6c4d34ff0cc019c59c..a615b6b95d90dfd7e94b4347d738aa91f988a792 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
@@ -20,11 +20,16 @@ def MuonCombinedTrackSummaryToolCfg(flags, name="", **kwargs):
extrapolator = result.getPrimary()
result.addPublicTool(extrapolator)
+ from InDetConfig. InDetRecToolConfig import InDetBoundaryCheckToolCfg
+ acc = InDetBoundaryCheckToolCfg(flags, name="CombinedMuonIDBoundaryCheckTool")
+ boundary_tool = result.popToolsAndMerge(acc)
+
from InDetConfig.InDetRecToolConfig import InDetTrackHoleSearchToolCfg
acc = InDetTrackHoleSearchToolCfg(flags,
name = "CombinedMuonIDHoleSearch",
Extrapolator = extrapolator,
CountDeadModulesAfterLastHit = True,
+ BoundaryCheckTool = boundary_tool,
Cosmics = (flags.Beam.Type=="cosmics"))
indet_hole_search_tool = acc.getPrimary()
result.addPublicTool(indet_hole_search_tool)
@@ -38,6 +43,9 @@ def MuonCombinedTrackSummaryToolCfg(flags, name="", **kwargs):
PixelToTPIDTool = None,
TestBLayerTool = None,
DoSharedHits = False,
+ usePixel = True,
+ useSCT = True,
+ useTRT = True,
HoleSearch = indet_hole_search_tool)
indet_track_summary_helper_tool = acc.getPrimary()
result.addPublicTool(indet_track_summary_helper_tool)
@@ -74,6 +82,8 @@ def MuonTrackToVertexCfg(flags, name = 'MuonTrackToVertexTool', **kwargs ):
return acc
def MuonCombinedInDetDetailedTrackSelectorToolCfg(flags, name="MuonCombinedInDetDetailedTrackSelectorTool",**kwargs):
+ from TrkConfig.AtlasTrackSummaryToolConfig import AtlasTrackSummaryToolCfg
+
if flags.Beam.Type == 'collisions':
kwargs.setdefault("pTMin", 2000 )
kwargs.setdefault("IPd0Max", 50.0 )
@@ -99,8 +109,7 @@ def MuonCombinedInDetDetailedTrackSelectorToolCfg(flags, name="MuonCombinedInDet
extrapolator = result.getPrimary()
kwargs.setdefault("Extrapolator", extrapolator )
- # FIXME the configuration of TrackSummaryTool should probably be centralised.
- acc = MuonCombinedTrackSummaryToolCfg(flags)
+ acc = AtlasTrackSummaryToolCfg(flags)
kwargs.setdefault("TrackSummaryTool", acc.popPrivateTools() )
result.merge(acc)
@@ -119,6 +128,20 @@ def MuonCombinedInDetDetailedTrackSelectorToolCfg(flags, name="MuonCombinedInDet
result.setPrivateTools(tool)
return result
+def MuonCombinedInDetDetailedTrackSelectorTool_LRTCfg(flags, name='MuonCombinedInDetDetailedTrackSelectorTool_LRT', **kwargs):
+ kwargs.setdefault("pTMin", 2000 )
+ kwargs.setdefault("IPd0Max", 1.e4 )
+ kwargs.setdefault("IPz0Max", 1.e4 )
+ kwargs.setdefault("z0Max", 1.e4 )
+ kwargs.setdefault("useTrackSummaryInfo", True )
+ kwargs.setdefault("nHitBLayer", 0 )
+ kwargs.setdefault("nHitPix", 0 )
+ kwargs.setdefault("nHitBLayerPlusPix", 0 )
+ kwargs.setdefault("nHitSct", 4 )
+ kwargs.setdefault("nHitSi", 4 )
+ kwargs.setdefault("nHitTrt", 0 )
+ kwargs.setdefault("useTrackQualityInfo", False )
+ return MuonCombinedInDetDetailedTrackSelectorToolCfg(flags, name,**kwargs)
def MuonCombinedParticleCreatorCfg(flags, name="MuonCombinedParticleCreator",**kwargs):
result = ComponentAccumulator()
@@ -240,7 +263,7 @@ def MuonCreatorToolCfg(flags, name="MuonCreatorTool", **kwargs):
kwargs.setdefault("ParticleCaloExtensionToolID", acc.getPrimary() )
result.merge(acc)
- from MuonConfig.MuonRecToolsConfig import MuonAmbiProcessorCfg, MuonTrackSummaryToolCfg
+ from MuonConfig.MuonRecToolsConfig import MuonAmbiProcessorCfg
acc = MuonAmbiProcessorCfg(flags)
kwargs.setdefault("AmbiguityProcessor", acc.popPrivateTools())
result.merge(acc)
@@ -258,6 +281,7 @@ def MuonCreatorToolCfg(flags, name="MuonCreatorTool", **kwargs):
kwargs.setdefault("TrackQuery", result.popToolsAndMerge(MuonTrackQueryCfg(flags)) )
if flags.Muon.SAMuonTrigger:
+ from MuonConfig.MuonRecToolsConfig import MuonTrackSummaryToolCfg
acc = MuonTrackSummaryToolCfg(flags)
kwargs.setdefault("TrackSummaryTool", acc.popPrivateTools())
result.merge(acc)
@@ -600,6 +624,7 @@ def MuonAlignmentUncertToolThetaCfg(flags,name ="MuonAlignmentUncertToolTheta",
tool = CompFactory.Muon.MuonAlignmentUncertTool(name,**kwargs)
result.addPublicTool(tool)
return result
+
def MuonAlignmentUncertToolPhiCfg(flags,name ="MuonAlignmentUncertToolPhi", **kwargs):
result = ComponentAccumulator()
kwargs.setdefault("HistoName", "PhiScattering")
@@ -607,6 +632,7 @@ def MuonAlignmentUncertToolPhiCfg(flags,name ="MuonAlignmentUncertToolPhi", **kw
tool = CompFactory.Muon.MuonAlignmentUncertTool(name,**kwargs)
result.addPublicTool(tool)
return result
+
def CombinedMuonTrackBuilderCfg(flags, name='CombinedMuonTrackBuilder', **kwargs ):
from AthenaCommon.SystemOfUnits import meter
from MuonConfig.MuonRIO_OnTrackCreatorConfig import CscClusterOnTrackCreatorCfg,MdtDriftCircleOnTrackCreatorCfg
@@ -702,9 +728,7 @@ def CombinedMuonTrackBuilderCfg(flags, name='CombinedMuonTrackBuilder', **kwargs
# configure tools for data reprocessing
if flags.Muon.enableErrorTuning and 'MuonErrorOptimizer' not in kwargs:
# use alignment effects on track for all algorithms
-
- # FIXME - useAlignErrs set to false until MuonAlignmentErrorDBAlg config is available
- useAlignErrs = False
+ useAlignErrs = False # FIXME - change this once the MuonAlignmentErrorDBAlg issues are sorted out.
# FIXME - handle this.
# if conddb.dbdata == 'COMP200' or conddb.dbmc == 'COMP200' or 'HLT' in globalflags.ConditionsTag() or conddb.isOnline or TriggerFlags.MuonSlice.doTrigMuonConfig:
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py
index 6abddb39134c561464f9f2d7569d99a91f131353..4b03541ea12b545ed46cb409040fc8dd6f0f0ceb 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py
@@ -153,7 +153,7 @@ def MuonCombinedMuonCandidateAlgCfg(flags, name="MuonCombinedMuonCandidateAlg",
result.addEventAlgo( alg, primary=True )
return result
-def MuonCombinedInDetCandidateAlg(flags, name="MuonCombinedInDetCandidateAlg",**kwargs ):
+def MuonCombinedInDetCandidateAlgCfg(flags, name="MuonCombinedInDetCandidateAlg",**kwargs ):
# FIXME - need to have InDet flags set at this point to know if doForwardTracks is true.
from MuonCombinedConfig.MuonCombinedRecToolsConfig import MuonCombinedInDetDetailedTrackSelectorToolCfg
from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
@@ -180,6 +180,22 @@ def MuonCombinedInDetCandidateAlg(flags, name="MuonCombinedInDetCandidateAlg",**
result.addEventAlgo( alg, primary=True )
return result
+def MuonCombinedInDetCandidateAlg_LRTCfg(flags, name="MuonCombinedInDetCandidateAlg_LRT",**kwargs ):
+ from MuonCombinedConfig.MuonCombinedRecToolsConfig import MuonCombinedInDetDetailedTrackSelectorToolCfg, MuonCombinedInDetDetailedTrackSelectorTool_LRTCfg
+ tmpAcc1 = MuonCombinedInDetDetailedTrackSelectorTool_LRTCfg(flags)
+ kwargs.setdefault("TrackSelector", tmpAcc1.getPrimary() )
+ ### Use the Standard Track particle container in cases where no separate containters will be
+ ### saved for the LRT tracking
+ kwargs.setdefault("TrackParticleLocation",["InDetLargeD0TrackParticles"])
+ kwargs.setdefault("InDetCandidateLocation","TrackParticleCandidateLRT")
+ kwargs.setdefault("DoSiliconAssocForwardMuons", False)
+ tmpAcc2 = MuonCombinedInDetDetailedTrackSelectorToolCfg(flags, "MuonCombinedInDetDetailedForwardTrackSelectorTool", nHitSct=0)
+ kwargs.setdefault("InDetForwardTrackSelector", tmpAcc2.getPrimary() )
+ result = MuonCombinedInDetCandidateAlgCfg(flags, name, **kwargs)
+ result.merge(tmpAcc1)
+ result.merge(tmpAcc2)
+ return result
+
def MuonCombinedAlgCfg( flags, name="MuonCombinedAlg",**kwargs ):
from MuonCombinedConfig.MuonCombinedRecToolsConfig import MuonCombinedToolCfg
@@ -306,9 +322,13 @@ def MuonCombinedReconstructionCfg(flags):
from TrkConfig.TrackCollectionReadConfig import TrackCollectionReadCfg
result.merge (TrackCollectionReadCfg (flags, 'Tracks'))
- result.merge( MuonCombinedInDetCandidateAlg(flags) )
+ result.merge( MuonCombinedInDetCandidateAlgCfg(flags) )
result.merge( MuonCombinedMuonCandidateAlgCfg(flags) )
+ doLRT = False # FIXME, once this is in InDetFlags
+ if (doLRT):
+ result.merge( MuonCombinedInDetCandidateAlg_LRTCfg(flags) )
+
if flags.MuonCombined.doStatisticalCombination or flags.MuonCombined.doCombinedFit:
result.merge( MuonCombinedAlgCfg(flags) )
@@ -344,7 +364,7 @@ if __name__=="__main__":
ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.0/v2/myESD.pool.root']
# Keep this comment in, for easy local debugging.
- # ConfigFlags.Input.Files = ['../q221/myESD.pool.root']
+ # ConfigFlags.Input.Files = ['/eos/atlas/atlascerngroupdisk/data-art/grid-input/MuonCombinedConfig/myESD_q221_unslimmedTracks.pool.root']
ConfigFlags.Concurrency.NumThreads=args.threads
ConfigFlags.Concurrency.NumConcurrentEvents=args.threads # Might change this later, but good enough for the moment.
@@ -359,7 +379,9 @@ if __name__=="__main__":
ConfigFlags.Detector.GeometryPixel = True
ConfigFlags.Detector.GeometrySCT = True
ConfigFlags.Detector.GeometryTRT = True
-
+ ConfigFlags.Detector.RecoPixel = True
+ ConfigFlags.Detector.RecoSCT = True
+ ConfigFlags.Detector.RecoTRT = True
ConfigFlags.Output.ESDFileName=args.output
if args.debug:
diff --git a/Tracking/TrkConfig/python/AtlasTrackSummaryToolConfig.py b/Tracking/TrkConfig/python/AtlasTrackSummaryToolConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..e9aaf49954c4e8b255a6e78bda5efa8379868a95
--- /dev/null
+++ b/Tracking/TrkConfig/python/AtlasTrackSummaryToolConfig.py
@@ -0,0 +1,71 @@
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+
+# from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from TrkConfig.AtlasExtrapolatorConfig import AtlasExtrapolatorCfg
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+
+def AtlasTrackSummaryToolCfg(flags, name="", **kwargs):
+ # Based on AtlasTrackSummaryTool.py
+ # FIXME - check all of this once the ID configuration is available, because probably we can simplify this a lot
+ from InDetConfig.InDetRecToolConfig import InDetBoundaryCheckToolCfg, InDetTrackSummaryHelperToolCfg
+
+ # Setup Atlas Extrapolator
+ result = AtlasExtrapolatorCfg(flags)
+ extrapolator = result.getPrimary()
+ result.addPublicTool(extrapolator)
+
+ # Setup Association Tool
+ # FIXME - use InDetConfig when it works...
+ # acc = InDetPrdAssociationToolCfg(flags,
+ # name='AtlasPrdAssociationTool',
+ # PixelClusterAmbiguitiesMapName="PixelClusterAmbiguitiesMap")
+ # atlasPrdAssociationTool = acc.getPrimary()
+ atlasPrdAssociationTool = CompFactory.InDet.InDetPRD_AssociationToolGangedPixels(name='AtlasPrdAssociationTool',
+ PixelClusterAmbiguitiesMapName = "PixelClusterAmbiguitiesMap")
+ # result.merge(acc)
+
+ # Setup Boundary Check Tool
+ acc = InDetBoundaryCheckToolCfg(flags,
+ name="AtlasBoundaryCheckTool",
+ UsePixel=flags.Detector.RecoPixel,
+ UseSCT=flags.Detector.RecoSCT)
+ atlasBoundaryCheckTool = acc.getPrimary()
+ result.merge(acc)
+
+ # Loading Configurable HoleSearchTool
+ from InDetConfig.InDetRecToolConfig import InDetTrackHoleSearchToolCfg
+ acc = InDetTrackHoleSearchToolCfg(flags,
+ name="AtlasHoleSearchTool",
+ Extrapolator=extrapolator,
+ BoundaryCheckTool=atlasBoundaryCheckTool)
+ atlasHoleSearchTool = acc.getPrimary()
+ result.merge(acc)
+
+ # FIXME - need InDet to provide configuration for PixelConditionsSummaryTool
+ # Also assuming we don't use DetailedPixelHoleSearch (since it seems to be off in standard workflows)
+ acc = InDetTrackSummaryHelperToolCfg(flags,
+ name="AtlasTrackSummaryHelperTool",
+ AssoTool=atlasPrdAssociationTool,
+ DoSharedHits=False,
+ HoleSearch=atlasHoleSearchTool)
+ indet_track_summary_helper_tool = acc.getPrimary()
+ result.merge(acc)
+
+ from MuonConfig.MuonRecToolsConfig import MuonTrackSummaryHelperToolCfg
+ acc = MuonTrackSummaryHelperToolCfg(flags)
+ muon_track_summary_helper_tool = acc.getPrimary()
+ track_summary_tool = CompFactory.Trk.TrackSummaryTool(name="CombinedMuonTrackSummary",
+ doSharedHits=False,
+ doHolesInDet=True,
+ doHolesMuon=False,
+ AddDetailedInDetSummary=True,
+ AddDetailedMuonSummary=True,
+ InDetSummaryHelperTool=indet_track_summary_helper_tool,
+ TRT_ElectronPidTool=None,
+ PixelToTPIDTool=None,
+ MuonSummaryHelperTool=muon_track_summary_helper_tool,
+ PixelExists=True)
+ result.merge(acc)
+ result.setPrivateTools(track_summary_tool)
+ return result
diff --git a/Tracking/TrkConfig/python/SolenoidalIntersectorConfig.py b/Tracking/TrkConfig/python/SolenoidalIntersectorConfig.py
index aaa0a21e8a97eaac4131bd58054eae465ef0947d..5344cc51dbf0ad8ed4fb9461512175c851b42cd9 100644
--- a/Tracking/TrkConfig/python/SolenoidalIntersectorConfig.py
+++ b/Tracking/TrkConfig/python/SolenoidalIntersectorConfig.py
@@ -8,7 +8,7 @@ def SolenoidalIntersectorCfg(flags, name='SolenoidalIntersector', **kwargs):
result = ComponentAccumulator()
cls = CompFactory.Trk.SolenoidParametrizationCondAlg # TrkExSolenoidalIntersector
- condalg = cls (AtlasFieldCacheCondObj = 'fieldCondObj',
+ condalg = cls (name='SolenoidParametrizationCondAlg', AtlasFieldCacheCondObj = 'fieldCondObj',
WriteKey = 'SolenoidParametrization')
result.addCondAlgo (condalg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
index 5d5dac500a1aa4ecdfb4322c25a1daf55d646bfc..d6c6c787295b9bdbf3972ef95c403026560cff5f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
@@ -26,7 +26,7 @@ from TileGeoModel.TileGMConfig import TileGMCfg
from MuonConfig.MuonSegmentFindingConfig import MooSegmentFinderAlgCfg
from MuonConfig.MuonTrackBuildingConfig import MuonTrackBuildingCfg
from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCombinedMuonCandidateAlgCfg, MuonInsideOutRecoAlgCfg
-from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCombinedInDetCandidateAlg, MuonCombinedAlgCfg, MuonCreatorAlgCfg
+from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCombinedInDetCandidateAlgCfg, MuonCombinedAlgCfg, MuonCreatorAlgCfg
from TrigMuonEF.TrigMuonEFConfig_newJO import TrigMuonEFTrackIsolationAlgCfg, MuonFilterAlgCfg, MergeEFMuonsAlgCfg
from AthenaCommon.CFElements import seqAND, parOR, seqOR
@@ -416,7 +416,7 @@ def muEFCBStep(flags, chainDict, name='RoI'):
recoCB.mergeReco(EFMuonCBViewDataVerifierCfg(name))
- indetCandCfg = MuonCombinedInDetCandidateAlg(flags, name="TrigMuonCombinedInDetCandidateAlg_"+name, TrackParticleLocation=[trackName],
+ indetCandCfg = MuonCombinedInDetCandidateAlgCfg(flags, name="TrigMuonCombinedInDetCandidateAlg_"+name, TrackParticleLocation=[trackName],
InDetCandidateLocation="IndetCandidates_"+name, TrackSelector="",DoSiliconAssocForwardMuons=False, InDetForwardTrackSelector="")
recoCB.mergeReco(indetCandCfg)
muonCombCfg = MuonCombinedAlgCfg(flags, name="TrigMuonCombinedAlg_"+name, MuonCandidateLocation=muonCandName,