diff --git a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py index ad92f0d56812316159a4154a0f978f92f11664cf..4842df7e64c8dab9461bca4e66209f977ab40224 100644 --- a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py +++ b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py @@ -165,7 +165,7 @@ def ITkTrackCollectionCnvToolCfg(flags, name="ITkTrackCollectionCnvTool", ITkTra result.setPrivateTools(CompFactory.xAODMaker.TrackCollectionCnvTool(name, **kwargs)) return result -def ITkTrackCollectionMergerAlgCfg(flags, name="ITkTrackCollectionMerger", InputCombinedTracks=None, **kwargs): +def ITkTrackCollectionMergerAlgCfg(flags, name="ITkTrackCollectionMerger", InputCombinedTracks=None, CombinedITkClusterSplitProbContainer=None, **kwargs): result = ComponentAccumulator() kwargs.setdefault("TracksLocation", InputCombinedTracks) @@ -177,7 +177,8 @@ def ITkTrackCollectionMergerAlgCfg(flags, name="ITkTrackCollectionMerger", Input kwargs.setdefault("UpdateSharedHits", True) kwargs.setdefault("UpdateAdditionalInfo", True) from InDetConfig.ITkTrackingCommonConfig import ITkTrackSummaryToolSharedHitsCfg - TrackSummaryTool = result.getPrimaryAndMerge(ITkTrackSummaryToolSharedHitsCfg(flags)) + TrackSummaryTool = result.getPrimaryAndMerge(ITkTrackSummaryToolSharedHitsCfg(flags, name="CombinedITkSplitProbTrackSummaryToolSharedHits")) + TrackSummaryTool.InDetSummaryHelperTool.ClusterSplitProbabilityName = CombinedITkClusterSplitProbContainer kwargs.setdefault("SummaryTool", TrackSummaryTool) result.addEventAlgo(CompFactory.Trk.TrackCollectionMerger(name, **kwargs)) @@ -284,7 +285,9 @@ def ITkTrackRecoCfg(flags): InputExtendedITkTracks += [TrackContainer] - result.merge(ITkTrackCollectionMergerAlgCfg(flags, InputCombinedTracks=InputCombinedITkTracks)) + result.merge(ITkTrackCollectionMergerAlgCfg(flags, + InputCombinedTracks = InputCombinedITkTracks, + CombinedITkClusterSplitProbContainer = ClusterSplitProbContainer)) if flags.ITk.Tracking.doTruth: from InDetConfig.ITkTrackTruthConfig import ITkTrackTruthCfg diff --git a/InnerDetector/InDetConfig/python/TrackRecoConfig.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py index 7ab9d82b09b21e478858da4dfbbf0984c99afe8c..a24801fb59dfb92164423973e0d56fd6480a33d5 100644 --- a/InnerDetector/InDetConfig/python/TrackRecoConfig.py +++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py @@ -180,7 +180,7 @@ def TrackCollectionCnvToolCfg(flags, name="TrackCollectionCnvTool", TrackParticl )) return result -def TrackCollectionMergerAlgCfg(flags, name="InDetTrackCollectionMerger", InputCombinedTracks=None, **kwargs): +def TrackCollectionMergerAlgCfg(flags, name="InDetTrackCollectionMerger", InputCombinedTracks=None, CombinedInDetClusterSplitProbContainer=None, **kwargs): result = ComponentAccumulator() kwargs.setdefault("TracksLocation", InputCombinedTracks) @@ -192,7 +192,8 @@ def TrackCollectionMergerAlgCfg(flags, name="InDetTrackCollectionMerger", InputC kwargs.setdefault("UpdateSharedHits", True) kwargs.setdefault("UpdateAdditionalInfo", True) from InDetConfig.TrackingCommonConfig import InDetTrackSummaryToolSharedHitsCfg - TrackSummaryTool = result.getPrimaryAndMerge(InDetTrackSummaryToolSharedHitsCfg(flags)) + TrackSummaryTool = result.getPrimaryAndMerge(InDetTrackSummaryToolSharedHitsCfg(flags, name="CombinedInDetSplitProbTrackSummaryToolSharedHits")) + TrackSummaryTool.InDetSummaryHelperTool.ClusterSplitProbabilityName = CombinedInDetClusterSplitProbContainer kwargs.setdefault("SummaryTool", TrackSummaryTool) result.addEventAlgo(CompFactory.Trk.TrackCollectionMerger(name, **kwargs)) @@ -498,7 +499,9 @@ def InDetTrackRecoCfg(flags): - result.merge(TrackCollectionMergerAlgCfg(flags, InputCombinedTracks=InputCombinedInDetTracks)) + result.merge(TrackCollectionMergerAlgCfg(flags, + InputCombinedTracks = InputCombinedInDetTracks, + CombinedInDetClusterSplitProbContainer = ClusterSplitProbContainer)) if flags.InDet.doTruth: from InDetConfig.TrackTruthConfig import InDetTrackTruthCfg