Skip to content

More VecGeom v2.x compatibility #15821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
Sep 21, 2026
+11 −2
Merged

More VecGeom v2.x compatibility #15821

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions Detectors/Base/src/GeometryManager.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,11 @@ void ensureVecGeomWorldBuilt()
tgeo2vecgeom::RootGeoManager::Instance().LoadRootGeometry();

// Acceleration structures must be built before the navigators/locators reference them.
#if VECGEOM_VERSION < 0x020000
// VecGeom 2 has no ABBoxManager: the BVH below is built directly.
vecgeom::ABBoxManager::Instance().InitABBoxesForCompleteGeometry();
// Builds a BVH per logical volume from the ABBoxes computed above.
#endif
// Builds a BVH per logical volume.
vecgeom::BVHManager::Init();

// For each logical volume, set both a navigator (used for ComputeStep) and a matched
Expand Down Expand Up @@ -752,9 +755,15 @@ bool GeometryManager::vecGeomLocate(double x, double y, double z, std::vector<TG
chain.clear();
#ifdef O2_WITH_VECGEOM
ensureVecGeomWorldBuilt();
// One state per thread, as for the material budget above.
// One state per thread, as for the material budget above, and allocated the
// same way: see the comment there on NavStatePath vs NavStateIndex.
#if VECGEOM_VERSION >= 0x020000
thread_local vecgeom::NavigationState stateStorage;
thread_local vecgeom::NavigationState* state = &stateStorage;
#else
thread_local vecgeom::NavigationState* state =
vecgeom::NavigationState::MakeInstance(vecgeom::GeoManager::Instance().getMaxDepth());
#endif
state->Clear();
const vecgeom::Vector3D<vecgeom::Precision> point(x, y, z);
if (vecgeom::GlobalLocator::LocateGlobalPoint(vecgeom::GeoManager::Instance().GetWorld(), point, *state, true) ==
Expand Down
Loading