diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py index 0063dfe772361e771ade5cc9661ff4e142aa26fe..874a799bf0ae4bacafef028b97d9c3e9f314caa6 100644 --- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py @@ -504,10 +504,11 @@ class ConfiguredNewTrackingSiPattern: doHadCaloSeed = InDetFlags.doCaloSeededRefit(), InputHadClusterContainerName = InDetKeys.HadCaloClusterROIContainer()+"Bjet") - # DenseEnvironmentsAmbiguityScoreProcessorTool + # DenseEnvironmentsAmbiguityScoreProcessorTool from TrkAmbiguityProcessor.TrkAmbiguityProcessorConf import Trk__DenseEnvironmentsAmbiguityScoreProcessorTool as ScoreProcessorTool InDetAmbiguityScoreProcessor = ScoreProcessorTool(name = 'InDetAmbiguityScoreProcessor'+NewTrackingCuts.extension(), ScoringTool = InDetAmbiScoringTool, + SplitProbTool = NnPixelClusterSplitProbTool if InDetFlags.doPixelClusterSplitting() and 'NnPixelClusterSplitProbTool' in globals() else None, AssociationTool = TrackingCommon.getInDetPRDtoTrackMapToolGangedPixels(), AssociationToolNotGanged = TrackingCommon.getPRDtoTrackMapTool(), AssociationMapName = 'PRDToTrackMap'+NewTrackingCuts.extension(), @@ -529,9 +530,8 @@ class ConfiguredNewTrackingSiPattern: RefitPrds = True) InDetAmbiguityScoreProcessor = None - if InDetFlags.doTIDE_Ambi() and not (NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "DBM") and 'NnPixelClusterSplitProbTool' in globals(): - if InDetAmbiguityScoreProcessor : - InDetAmbiguityScoreProcessor.SplitProbTool = NnPixelClusterSplitProbTool + if InDetFlags.doTIDE_Ambi() and not (NewTrackingCuts.mode() == "ForwardSLHCTracks" or NewTrackingCuts.mode() == "ForwardTracks" or NewTrackingCuts.mode() == "DBM") and 'NnPixelClusterSplitProbTool' in globals() : + if InDetAmbiguityScoreProcessor is not None : InDetAmbiguityScoreProcessor.sharedProbCut = prob1 InDetAmbiguityScoreProcessor.sharedProbCut2 = prob2 if NewTrackingCuts.extension() == "": @@ -564,7 +564,7 @@ class ConfiguredNewTrackingSiPattern: printfunc (InDetAmbiguityProcessor) # add InDetAmbiguityScoreProcessor - if InDetAmbiguityScoreProcessor : + if InDetAmbiguityScoreProcessor is not None : ToolSvc += InDetAmbiguityScoreProcessor # diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.cxx b/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.cxx index 9cca17d85c476a3bc76d7469762d73e786053f19..03db0a887b1efaf9fb0f81ba3d24556b596a7946 100644 --- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.cxx +++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/DenseEnvironmentsAmbiguityScoreProcessorTool.cxx @@ -294,7 +294,7 @@ Trk::DenseEnvironmentsAmbiguityScoreProcessorTool::overlappingTracks(const Track //Update the pixel split information if the element is unique (The second element of the pair indiciates if the element was inserted into the map) auto ret = setOfPixelClustersOnTrack.insert(std::make_pair( pixel, (*tsos)->trackParameters() )); - if (ret.second) { + if (ret.second && m_splitProbTool.isEnabled()) { updatePixelSplitInformationForCluster( *(ret.first), splitClusterMap); }