Repository navigation
Conversation
This makes the VecGeom navigator start a new run of zero steps when a stuck-track push moved the track into a volume the run did not alternate between. - The new run counts from zero and decides again between chords and momentum steps. - A run restarts only if the track moved by at least half the push, and at most three times until the next finite step, so a track cannot be held forever. - The volumes of a run are recorded from its eighth zero step only. - The 10 um cap and the chord/momentum rule are unchanged. - This changes the output of the current locate too. - Two unit test cases cover the restart, the two conditions that prevent it, and the abort after the fourth run. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This makes both VecGeom navigators update the Geant4 history incrementally for the three common transitions. - Entering a daughter of the current volume adds that placement's chain of Geant4 levels. - Leaving to the mother removes it, and moving into a sibling replaces it. - Every other change still goes through historyFromState, which walked every level on every crossing. - The update lives in the base class, so the relocating and the propagating navigator share it. - The history is the same as before: the levels and their transforms are made by the same NewLevel calls. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This adds a run-time switch G4.vecgeomLeanLocate (default off) that locates a boundary crossing of the relocating VecGeom navigator the way VecGeom relocates. - The point is pushed 1e-6 cm along the step direction, VecGeom's own push, instead of one tolerance across the face. - No face normal is computed for the push, and the flush-volume loop is not run: at that depth containment pops every flush mother. - An exit no longer records a block for the next step. Every mother with daughters is stepped with BVHNavigatorV, which refuses at zero distance a daughter the ray leaves. - A parallel world node just left is still refused while the direction leaves it, with the normal computed only for that node. - The navigator unit test runs every case with both locates. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This fixes the safety of the propagating VecGeom navigator (G4.vecgeomNavigator=kPropagated) and adds unit tests. - ComputeSafety answered 0 at every point until the next within-volume locate after a crossing, so the end point of the first step in a new volume had no safety. - It now answers 0 only at the point where the crossing was located and at the end point of a step that ends on a boundary, as VecGeomG4Navigator does. - The locate now consumes fWasLimitedByGeometry as G4Navigator does, so a new track is no longer taken for a crossing with the previous track's flags. - ResetHierarchyAndLocate now clears the crossing state left by the previous track. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This makes the lean crossing locate the default of the relocating VecGeom navigator and moves its navigator choice into the geometry setup. - G4.vecgeomLeanLocate now defaults to true; false keeps the previous locate as a fallback for one release. - GeometryManager::setVecGeomBvhForSmallMothers gives volumes with one or two daughters BVHNavigatorV, replacing the per-step choice in the navigator. - Those volumes also get BVHSafetyEstimator, the estimator BVHNavigatorV uses in the step, so ComputeSafety and the step agree. - Their level locators are unchanged; kPropagated and the previous locate keep the simple navigator and estimator. - The BVH navigator is installed under the same O2_VECGEOM_HAS_BVH_VNAVIGATOR guard as in buildVecGeomGeometry. - The lean navigator checks this setting at every new track, and every caller of its constructor states the locate. - The unit test sets the geometry up for each navigator as o2-sim does. Co-Authored-By: Claude Opus 5.5 <[email protected]>
Collaborator
|
Error while checking build/O2/fullCI_slc9 for c1c1773 at 2026-11-21 14:29: Full log here. |
This branch has not been deployed
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
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 makes the lean crossing locate the default of
G4.navmode=kVecGeomand moves the choice of VecGeom navigator for small mothers into the geometry setup.G4.vecgeomLeanLocate=falsekeeps the previous locate as a fallback for one release.The effect on the event loop, serial pp, 6 seeds, same build and node:
The physics agrees with TGeo as well as the previous locate does: 1 GeV photons in EMCAL 0.9999 ± 0.0007 of TGeo; pp (8 × 3000 events), Pb-Pb (2 × 20) and the aligned ITS with the parallel world (2 × 600, ITS hits 1.007 ± 0.005) within 2σ in every detector; no aborts. MID in pp is 0.948 ± 0.026 of TGeo over 8 seeds and 0.986 ± 0.032 over the 6 seeds after the first observation; a pion gun into the muon arm gives 1.006 ± 0.023.
This sits on top of #16165.
Assisted by Claude Code.