Merge branch 'main' into ex-fix-pytest-odd-cleanup

.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
@@ -179,7 +179,7 @@ jobs:
         run: >
           echo "::group::Dependencies"
           && git config --global safe.directory "$GITHUB_WORKSPACE"
-          && pip3 install histcmp==0.6.6 matplotlib
+          && pip3 install histcmp==0.6.7 matplotlib
           && pip3 install -r Examples/Scripts/requirements.txt
           && /usr/local/bin/geant4-config --install-datasets
           && source build/this_acts_withdeps.sh
@@ -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

.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:
@@ -232,7 +232,7 @@ linux_physmon:
     - cd ..
 
     - git config --global safe.directory "$GITHUB_WORKSPACE"
-    - pip3 install histcmp==0.6.6 matplotlib
+    - pip3 install histcmp==0.6.7 matplotlib
     - pip3 install -r src/Examples/Scripts/requirements.txt
     - /usr/local/bin/geant4-config --install-datasets
     - source build/this_acts_withdeps.sh
@@ -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

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: 'v14.0.0'
+    rev: 'v18.1.8'
     hooks:
       - id: clang-format
         types_or: [file]

Alignment/include/ActsAlignment/Kernel/Alignment.ipp

@@ -164,9 +164,6 @@ ActsAlignment::Alignment<fitter_t>::updateAlignmentParameters(
     // 1. The original transform
     const Acts::Vector3& oldCenter = surface->center(gctx);
     const Acts::Transform3& oldTransform = surface->transform(gctx);
-    const Acts::RotationMatrix3& oldRotation = oldTransform.rotation();
-    // The elements stored below is (rotZ, rotY, rotX)
-    const Acts::Vector3& oldEulerAngles = oldRotation.eulerAngles(2, 1, 0);
 
     // 2. The delta transform
     deltaAlignmentParam = alignResult.deltaAlignmentParameters.segment(
@@ -180,18 +177,17 @@ ActsAlignment::Alignment<fitter_t>::updateAlignmentParameters(
 
     // 3. The new transform
     const Acts::Vector3 newCenter = oldCenter + deltaCenter;
-    // The rotation around global z axis
-    Acts::AngleAxis3 rotZ(oldEulerAngles(0) + deltaEulerAngles(2),
-                          Acts::Vector3::UnitZ());
-    // The rotation around global y axis
-    Acts::AngleAxis3 rotY(oldEulerAngles(1) + deltaEulerAngles(1),
-                          Acts::Vector3::UnitY());
-    // The rotation around global x axis
-    Acts::AngleAxis3 rotX(oldEulerAngles(2) + deltaEulerAngles(0),
-                          Acts::Vector3::UnitX());
-    Eigen::Quaternion<Acts::ActsScalar> newRotation = rotZ * rotY * rotX;
-    const Acts::Transform3 newTransform =
-        Acts::Translation3(newCenter) * newRotation;
+    Acts::Transform3 newTransform = oldTransform;
+    newTransform.translation() = newCenter;
+    // Rotation first around fixed local x, then around fixed local y, and last
+    // around fixed local z, this is the same as first around local z, then
+    // around new loca y, and last around new local x below
+    newTransform *=
+        Acts::AngleAxis3(deltaEulerAngles(2), Acts::Vector3::UnitZ());
+    newTransform *=
+        Acts::AngleAxis3(deltaEulerAngles(1), Acts::Vector3::UnitY());
+    newTransform *=
+        Acts::AngleAxis3(deltaEulerAngles(0), Acts::Vector3::UnitX());
 
     // 4. Update the aligned transform
     //@Todo: use a better way to handle this (need dynamic cast to inherited

CMakeLists.txt

@@ -151,6 +151,9 @@ set_option_if(
 set_option_if(
   ACTS_BUILD_PLUGIN_DETRAY
   ACTS_BUILD_PLUGIN_TRACCC)
+set_option_if(
+  ACTS_BUILD_PLUGIN_JSON
+  ACTS_BUILD_PLUGIN_DETRAY)
 set_option_if(
   ACTS_BUILD_PLUGIN_COVFIE
   ACTS_BUILD_PLUGIN_DETRAY)
@@ -193,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
@@ -309,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)

Core/include/Acts/Definitions/Alignment.hpp

@@ -24,7 +24,7 @@ enum AlignmentIndices : unsigned int {
   eAlignmentCenter0 = 0u,
   eAlignmentCenter1 = eAlignmentCenter0 + 1u,
   eAlignmentCenter2 = eAlignmentCenter0 + 2u,
-  // Rotation angle around global x/y/z axis of geometry object
+  // Rotation angle around local x/y/z axis of geometry object
   eAlignmentRotation0 = 3u,
   eAlignmentRotation1 = eAlignmentRotation0 + 1u,
   eAlignmentRotation2 = eAlignmentRotation0 + 2u,

Core/include/Acts/Detector/DetectorVolumeVisitorConcept.hpp

@@ -18,12 +18,12 @@ class DetectorVolume;
 
 template <typename T>
 concept DetectorVolumeVisitor = requires(T v) {
-  {v(std::declval<const Experimental::DetectorVolume*>())};
+  { v(std::declval<const Experimental::DetectorVolume*>()) };
 };
 
 template <typename T>
 concept MutableDetectorVolumeVisitor = requires(T v) {
-  {v(std::declval<Experimental::DetectorVolume*>())};
+  { v(std::declval<Experimental::DetectorVolume*>()) };
 };
 
 }  // namespace Acts

Core/include/Acts/EventData/ChargeConcept.hpp

@@ -21,7 +21,7 @@ namespace Acts {
 
 template <typename C>
 concept ChargeConcept = requires(C c, C c2, float f, double d) {
-  {C{f}};
+  { C{f} };
 
   { c == c2 } -> std::same_as<bool>;
   { c != c2 } -> std::same_as<bool>;