[geom] Resolve MANY overlaps below ONLY nodes - #23204
Merged
dpiparo merged 2 commits intoSep 1, 2026
Merged
Conversation
Point location gives ONLY siblings priority over MANY placements, but boundary finding loses the MANY branch after descending into an ONLY daughter. This makes the two navigation paths disagree about the material crossed by a track. Preserve the branch's overlap candidates in both boundary APIs and add a regression test. Bump the stress references whose old values encoded the incorrect navigation, and make locally generated references readable in the same invocation. Fixes root-project#23192
Test Results 23 files 23 suites 3d 14h 25m 17s ⏱️ For more details on these failures, see this check. Results for commit f58597e. |
Member
|
/backport to 6.40 |
|
Preparing to backport PR #23204 to branch 6.40 requested by dpiparo |
|
This PR has been backported to branch 6.40: #23216 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This Pull request:
Changes or fixes:
TGeoNavigatorloses the overlap context of aMANYplacement afterdescending into one of its
ONLYdaughters. As a result, point location cangive an overlapping
ONLYsibling priority while boundary finding skips thatsibling and crosses the wrong material.
Check the
MANYancestor's declared overlap candidates from bothFindNextBoundary()andFindNextBoundaryAndStep(), including when the currentnode is an
ONLYdescendant. Add a focused regression test covering both APIs.The corrected navigation changes reference values in BRAHMS, STAR, BABAR2,
and ATLAS. Their
stressGeometryreference versions are increased, and the newfiles have been uploaded to
/eos/root-eos/testfiles/. The local referencegeneration readback path is also corrected.
Checklist:
This PR fixes #23192
AI-assisted coding disclosure
OpenAI Codex assisted with the investigation, implementation, and testing of
this change. I have reviewed and understand the submitted changes.