chore: Bump minimum GeoModel version to 6.3.0 (#3476)

Bumps GeoModel version and deals with the necessary changes. This is a subset of #3268 which isolates the version change and tackles the CI errors faced there. --------- Co-authored-by: Paul Gessinger <[email protected]>
acts-project · Aug 14, 2024 · 1d0a641 · 1d0a641
1 parent 89ded96
commit 1d0a641
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 198 deletions.
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -24,7 +24,7 @@ env:
 jobs:
   linux_ubuntu:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:53
+    container: ghcr.io/acts-project/ubuntu2404:57
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
@@ -109,7 +109,7 @@ jobs:
 
   linux_examples_test:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:53
+    container: ghcr.io/acts-project/ubuntu2404:57
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
@@ -146,7 +146,7 @@ jobs:
 
   linux_physmon:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:53
+    container: ghcr.io/acts-project/ubuntu2404:57
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
@@ -233,7 +233,7 @@ jobs:
             std: 20
           - image: ubuntu2204_clang
             std: 20
-    container: ghcr.io/acts-project/${{ matrix.image }}:53
+    container: ghcr.io/acts-project/${{ matrix.image }}:57
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
@@ -310,7 +310,7 @@ jobs:
       INSTALL_DIR: ${{ github.workspace }}/install_acts
       DEPENDENCY_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macOS/cmake/deps.8a95213.tar.zst
+      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macos-14/deps.v2.tar.zst
       # Works around an issue where root's RPATH is wrong for tbb, thus won't find it
       DYLD_LIBRARY_PATH: "${{ github.workspace }}/install/tbb/2021.11.0/lib"
     steps:
@@ -341,9 +341,6 @@ jobs:
             ${{ runner.os  }}-ccache_${{ env.CCACHE_KEY_SUFFIX }}_
 
       - name: Configure
-        # setting CMAKE_CXX_STANDARD=20 is a workaround for a bug in the
-        # dd4hep CMake configuration that gets triggered on recent CMake
-        # versions such as the one installed via homebrew
         run: >
           ccache -z
           && PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
@@ -352,7 +349,8 @@ jobs:
           -DCMAKE_PREFIX_PATH="${{ env.DEPENDENCY_DIR }}"
           -DPython_EXECUTABLE=${{ env.DEPENDENCY_DIR }}/bin/python3
           -DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}"
-          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=OFF
+          -DACTS_BUILD_PLUGIN_GEOMODEL=ON
+          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
       - name: Build
         run: cmake --build build
       - name: ccache stats

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
 
 clang_tidy:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:53
+  image: ghcr.io/acts-project/ubuntu2404:57
   tags:
     - large
   artifacts:
@@ -152,7 +152,7 @@ build_exatrkx:
 
 build_linux_ubuntu:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:53
+  image: ghcr.io/acts-project/ubuntu2404:57
 
   cache:
     key: ccache-${CI_JOB_NAME_SLUG}-${HEAD_REF}-${CCACHE_KEY_SUFFIX}
@@ -191,7 +191,7 @@ build_linux_ubuntu:
 
 linux_test_examples:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:53
+  image: ghcr.io/acts-project/ubuntu2404:57
   needs: [build_linux_ubuntu]
 
   script:
@@ -212,7 +212,7 @@ linux_test_examples:
 
 linux_physmon:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:53
+  image: ghcr.io/acts-project/ubuntu2404:57
   needs: [build_linux_ubuntu]
 
   artifacts:
@@ -299,7 +299,7 @@ linux_ubuntu_2404:
   <<: *linux_ubuntu_extra
   variables:
     CXXSTD: 20
-  image: ghcr.io/acts-project/ubuntu2404:53
+  image: ghcr.io/acts-project/ubuntu2404:57
 
 linux_ubuntu_2204_clang:
   <<: *linux_ubuntu_extra
@@ -313,7 +313,7 @@ linux_ubuntu_2204_clang:
 ######################
 
 .lcg: &lcg_base_job
-  image: ghcr.io/acts-project/${OS}-base:53
+  image: ghcr.io/acts-project/${OS}-base:57
   stage: build
   tags:
     - cvmfs

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,7 +196,7 @@ set(_acts_autodiff_version 0.6)
 set(_acts_boost_version 1.71.0)
 set(_acts_dd4hep_version 1.21)
 set(_acts_edm4hep_version 0.7)
-set(_acts_geomodel_version 4.6.0)
+set(_acts_geomodel_version 6.3.0)
 set(_acts_eigen3_version 3.3.7)
 set(_acts_podio_version 1.0.1) # will try this first
 set(_acts_podio_fallback_version 0.16) # if not found, will try this one
@@ -312,12 +312,8 @@ if(ACTS_BUILD_PLUGIN_JSON)
   endif()
 endif()
 if(ACTS_BUILD_PLUGIN_GEOMODEL)
-  if(ACTS_USE_SYSTEM_GEOMODEL)
-    find_package(GeoModelCore ${_acts_geomodel_version} REQUIRED CONFIG)
-    find_package(GeoModelIO ${_acts_geomodel_version} REQUIRED CONFIG)
-  else()
-    add_subdirectory(thirdparty/GeoModel)
-  endif()
+  find_package(GeoModelCore ${_acts_geomodel_version} REQUIRED CONFIG)
+  find_package(GeoModelIO ${_acts_geomodel_version} REQUIRED CONFIG)
 endif()
 if(ACTS_BUILD_PLUGIN_TGEO)
   find_package(ROOT ${_acts_root_version} REQUIRED CONFIG COMPONENTS Geom Graf)

diff --git a/Examples/Algorithms/Geant4/CMakeLists.txt b/Examples/Algorithms/Geant4/CMakeLists.txt
@@ -1,4 +1,5 @@
-set(ACTS_EXAMPLES_G4SOURCES
+add_library(
+  ActsExamplesGeant4 SHARED
     src/GdmlDetectorConstruction.cpp
     src/TelescopeG4DetectorConstruction.cpp
     src/Geant4Simulation.cpp
@@ -14,16 +15,6 @@ set(ACTS_EXAMPLES_G4SOURCES
     src/PhysicsListFactory.cpp
     src/Geant4Manager.cpp)
 
-if (ACTS_BUILD_EXAMPLES_DD4HEP)
-    list(APPEND ACTS_EXAMPLES_G4SOURCES src/DDG4DetectorConstruction.cpp)
-endif()
-
-if (ACTS_BUILD_PLUGIN_GEOMODEL)
-  list(APPEND ACTS_EXAMPLES_G4SOURCES src/GeoModelDetectorConstruction.cpp)
-endif()
-
-add_library(
-  ActsExamplesGeant4 SHARED ${ACTS_EXAMPLES_G4SOURCES})
 target_compile_definitions(
   ActsExamplesGeant4
   PUBLIC ${Geant4_DEFINITIONS})
@@ -50,12 +41,19 @@ if (ACTS_BUILD_EXAMPLES_DD4HEP)
     ActsExamplesGeant4
     PUBLIC ActsExamplesDetectorDD4hep DD4hep::DDCore DD4hep::DDG4)
   endif()
+
+  target_sources(ActsExamplesGeant4 PUBLIC src/DDG4DetectorConstruction.cpp)
 endif()
 
 if (ACTS_BUILD_PLUGIN_GEOMODEL)
+
+  target_sources(ActsExamplesGeant4 PUBLIC src/GeoModelDetectorConstruction.cpp)
+
+  find_library(GeoModel2G4_LIBRARY GeoModel2G4 REQUIRED)
+
   target_link_libraries(
     ActsExamplesGeant4
-    PUBLIC ActsPluginGeoModel GeoModel2G4)
+    PUBLIC ActsPluginGeoModel ${GeoModel2G4_LIBRARY})
 endif()
 
 install(

diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/GeoModelG4/GeoModelDetectorConstruction.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/GeoModelG4/GeoModelDetectorConstruction.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
+#include "Acts/Plugins/GeoModel/GeoModelTree.hpp"
 #include "ActsExamples/Geant4/DetectorConstructionFactory.hpp"
 #include "ActsExamples/Geant4/RegionCreator.hpp"
-#include <Acts/Plugins/GeoModel/GeoModelTree.hpp>
 
 #include <string>
 

diff --git a/Plugins/GeoModel/CMakeLists.txt b/Plugins/GeoModel/CMakeLists.txt
@@ -22,7 +22,7 @@ target_include_directories(
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 target_link_libraries(
     ActsPluginGeoModel
-  PUBLIC ActsCore GeoModelKernel GeoModelIO::GeoModelDBManager GeoModelIO::GeoModelRead)
+  PUBLIC ActsCore GeoModelCore::GeoModelKernel GeoModelIO::GeoModelDBManager GeoModelIO::GeoModelRead)
 
 install(
   TARGETS ActsPluginGeoModel

diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelTree.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelTree.hpp
@@ -18,7 +18,8 @@ namespace Acts {
 
 struct GeoModelTree {
   std::shared_ptr<GeoModelIO::ReadGeoModel> geoReader = nullptr;
-  GeoVPhysVol* worldVolume = nullptr;
+  PVConstLink worldVolume = nullptr;
   std::string worldVolumeName = "World";
 };
+
 }  // namespace Acts
diff --git a/Plugins/GeoModel/src/GeoModelBlueprintCreater.cpp b/Plugins/GeoModel/src/GeoModelBlueprintCreater.cpp
@@ -40,7 +40,8 @@ Acts::GeoModelBlueprintCreater::create(const GeometryContext& gctx,
         "GeoModelBlueprintCreater: GeoModelTree has no GeoModelReader");
   }
 
-  auto blueprintTable = gmTree.geoReader->getTableFromTableName(options.table);
+  auto blueprintTable =
+      gmTree.geoReader->getTableFromTableName_String(options.table);
 
   // Prepare the map
   std::map<std::string, TableEntry> blueprintTableMap;

diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoBoxConverterTests.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoBoxConverterTests.cpp
@@ -23,6 +23,8 @@
 #include <GeoModelKernel/GeoTrap.h>
 #include <GeoModelKernel/GeoTrd.h>
 
+#include "GeoModelKernel/GeoVPhysVol.h"
+
 Acts::GeometryContext tContext;
 Acts::RotationMatrix3 idRotation = Acts::RotationMatrix3::Identity();
 Acts::Transform3 idTransform = Acts::Transform3::Identity();
@@ -37,7 +39,7 @@ BOOST_AUTO_TEST_CASE(GeoBoxToSensitiveConversion) {
   // (BOX object) - XY
   auto boxXY = new GeoBox(100, 200, 2);
   auto logXY = new GeoLogVol("LogVolumeXY", boxXY, material);
-  auto fphysXY = new GeoFullPhysVol(logXY);
+  auto fphysXY = make_intrusive<GeoFullPhysVol>(logXY);
 
   auto converted = Acts::GeoBoxConverter{}.toSensitiveSurface(*fphysXY);
 
@@ -61,7 +63,7 @@ BOOST_AUTO_TEST_CASE(GeoBoxToSensitiveConversion) {
   // (BOX object) - YZ
   auto boxYZ = new GeoBox(2, 200, 300);
   auto logYZ = new GeoLogVol("LogVolumeYZ", boxYZ, material);
-  auto fphysYZ = new GeoFullPhysVol(logYZ);
+  auto fphysYZ = make_intrusive<GeoFullPhysVol>(logYZ);
 
   converted = Acts::GeoBoxConverter{}.toSensitiveSurface(*fphysYZ);
 
@@ -87,7 +89,7 @@ BOOST_AUTO_TEST_CASE(GeoBoxToSensitiveConversion) {
   // (BOX object) - XZ
   auto boxXZ = new GeoBox(400, 2, 300);
   auto logXZ = new GeoLogVol("LogVolumeXZ", boxXZ, material);
-  auto fphysXZ = new GeoFullPhysVol(logXZ);
+  auto fphysXZ = make_intrusive<GeoFullPhysVol>(logXZ);
 
   converted = Acts::GeoBoxConverter{}.toSensitiveSurface(*fphysXZ);
 

diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoTrdConverterTests.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoTrdConverterTests.cpp
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE(GeoTrfToSensitiveConversion) {
   //  double YHalfLength2, double ZHalfLength);
   auto trapYZ = new GeoTrd(2, 2, 50, 80, 60);
   auto logYZ = new GeoLogVol("LogVolumeYZ", trapYZ, material);
-  auto fphysYZ = new GeoFullPhysVol(logYZ);
+  auto fphysYZ = make_intrusive<GeoFullPhysVol>(logYZ);
 
   auto converted = Acts::GeoTrdConverter{}.toSensitiveSurface(*fphysYZ);
 
@@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE(GeoTrfToSensitiveConversion) {
   //  double YHalfLength2, double ZHalfLength);
   auto trapYZs = new GeoTrd(2, 2, 80, 50, 60);
   auto logYZs = new GeoLogVol("LogVolumeYZs", trapYZs, material);
-  auto fphysYZs = new GeoFullPhysVol(logYZs);
+  auto fphysYZs = make_intrusive<GeoFullPhysVol>(logYZs);
 
   converted = Acts::GeoTrdConverter{}.toSensitiveSurface(*fphysYZs);
 
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(GeoTrfToSensitiveConversion) {
   // (Trapezoid object) - XZ
   auto trapXZ = new GeoTrd(50, 80, 2, 2, 60);
   auto logXZ = new GeoLogVol("LogVolumeXZ", trapXZ, material);
-  auto fphysXZ = new GeoFullPhysVol(logXZ);
+  auto fphysXZ = make_intrusive<GeoFullPhysVol>(logXZ);
 
   converted = Acts::GeoTrdConverter{}.toSensitiveSurface(*fphysXZ);
 
@@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE(GeoTrfToSensitiveConversion) {
   // (Trapezoid object) - XZs (swapped)
   auto trapXZs = new GeoTrd(80, 50, 2, 2, 60);
   auto logXZs = new GeoLogVol("LogVolumeXZs", trapXZs, material);
-  auto fphysXZs = new GeoFullPhysVol(logXZs);
+  auto fphysXZs = make_intrusive<GeoFullPhysVol>(logXZs);
 
   converted = Acts::GeoTrdConverter{}.toSensitiveSurface(*fphysXZs);
 
@@ -174,7 +174,7 @@ BOOST_AUTO_TEST_CASE(GeoTrfToSensitiveConversion) {
   // Double - trazoid -> throw exception
   auto trapDouble = new GeoTrd(50, 80, 50, 80, 60);
   auto logDouble = new GeoLogVol("LogVolumeDouble", trapDouble, material);
-  auto fphysDouble = new GeoFullPhysVol(logDouble);
+  auto fphysDouble = make_intrusive<GeoFullPhysVol>(logDouble);
 
   BOOST_CHECK_THROW(Acts::GeoTrdConverter{}.toSensitiveSurface(*fphysDouble),
                     std::invalid_argument);

diff --git a/cmake/ActsExternSources.cmake b/cmake/ActsExternSources.cmake
@@ -26,10 +26,6 @@ set( ACTS_FRNN_SOURCE
    "GIT_REPOSITORY;https://github.com/hrzhao76/FRNN/;GIT_TAG;5f8a48b0022300cd2863119f5646a5f31373e0c8" CACHE STRING "Source to take FRNN from")
 mark_as_advanced( ACTS_FRNN_SOURCE )
 
-set( ACTS_GEOMODEL_SOURCE
-   "GIT_REPOSITORY;https://gitlab.cern.ch/GeoModelDev/GeoModel;GIT_TAG;4.6.0;" CACHE STRING "Source to take GeoModel from")
-mark_as_advanced( ACTS_GEOMODEL_SOURCE )
-
 set( ACTS_NLOHMANNJSON_SOURCE
    "URL;https://github.com/nlohmann/json/archive/refs/tags/v3.10.5.tar.gz;URL_HASH;SHA1=8969f5ad1a422e01f040ff48dcae9c0e6ad0811d" CACHE STRING "Source to take nlohmann_json from")
 mark_as_advanced( ACTS_NLOHMANN_JSON_SOURCE )