Merge branch 'main' into telescope-style-seeding

.clang-format

@@ -1,10 +1,9 @@
----
 BasedOnStyle: Google
 Language: Cpp
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
 PointerAlignment: Left
 ColumnLimit: 80
@@ -28,4 +27,3 @@ IncludeCategories:
   - Regex:    '^<.*>'
     Priority: 3
   # all headers not explicitly listed will be assigned to the last group
----

.github/issue_template.md

@@ -12,7 +12,7 @@ FOR YOUR INFORMATION AND MUST BE REMOVED BEFORE SUBMITTING THE ISSUE.
 
 - [ ] If the issue reports a bug:
 
-    - [ ] Please suggest whether this bug is critical / a blocker. One of the 
+    - [ ] Please suggest whether this bug is critical / a blocker. One of the
           maintainers will assign a corresponding labels.
     - [ ] Does the description contain all necessary information to reproduce
-          the error?
+          the error?

.github/pull_request_template.md

@@ -38,4 +38,4 @@ REQUEST.
 
 - If you push updates, and you know they will be superceded later on, consider adding
   `[skip ci]` in the commit message. This will instruct the CI system not to run any
-  jobs on this commit.
+  jobs on this commit.

.github/wip.yml

@@ -1,6 +1,5 @@
-- locations: 
+- locations:
     - title
     - label_name
   terms:
     - WIP
-

.github/workflows/analysis.yml

@@ -87,6 +87,7 @@ jobs:
   build_performance:
     runs-on: ubuntu-latest
     container: ghcr.io/acts-project/ubuntu2404:53
+    if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies

.github/workflows/backport.yml

@@ -6,7 +6,7 @@ on:
       - closed
       - labeled
 
-concurrency: 
+concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 

.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

.github/workflows/checks.yml

@@ -13,31 +13,30 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  format:
-    runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/format14:51
-    steps:
-      - uses: actions/checkout@v4
-      - name: Check
-        run: >
-          git config --global safe.directory "$GITHUB_WORKSPACE"
-          && CI/check_format .
-      - uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: changed
-          path: changed
-  format-py:
+  lint:
     runs-on: ubuntu-latest
+    env:
+      PRE_COMMIT_HOME: '/tmp/pre-commit'
+
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
-      - name: Install black
-        run: pip install black[jupyter]==24.4.2
-      - name: Run black format check
-        run: black --check . --extend-exclude ".*thirdparty.*"
+
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ${{ env.PRE_COMMIT_HOME }}
+          key: ${{ runner.os }}-${{ hashFiles('.pre-commit-config.yaml') }}
+
+      - name: Install pre-commit
+        run: pip install pre-commit
+
+      - name: Run pre-commit
+        run: pre-commit run --all-files --show-diff-on-failure
 
   license:
     runs-on: ubuntu-latest
@@ -67,16 +66,6 @@ jobs:
       - name: Check
         run: >
           CI/check_pragma_once.sh
-  end_of_line:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-      - name: Check
-        run: >
-          CI/check_end_of_file.py . --exclude "thirdparty/*" --reject-multiple-newlines --github
   type_t:
     runs-on: ubuntu-latest
     steps:

.github/workflows/docs.yml

@@ -54,7 +54,7 @@ jobs:
           -b linkcheck
           . _build/html/
 
-          
+
       - uses: actions/upload-artifact@v4
         with:
           name: acts-docs

.github/workflows/release.yml

@@ -1,6 +1,6 @@
 name: Release
 
-on: 
+on:
   push:
     branches:
       - 'releases'

.github/workflows/report.yml

@@ -67,7 +67,7 @@ jobs:
               return false;
             }
 
-            
+
             let number = Number(fs.readFileSync(file, {encoding: 'utf8'}).trim());
             console.log('PR number is '+number);
             core.exportVariable('PR_NUMBER', number)

.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

.merge-sentinel.yml

@@ -9,7 +9,7 @@ rules:
      - "main"
      - "develop/*"
     paths_ignore:
-     - "docs/*" 
+     - "docs/*"
 
     required_checks:
      - Docs / docs
@@ -24,6 +24,6 @@ rules:
      - "main"
      - "develop/*"
     paths:
-     - "docs/*" 
+     - "docs/*"
     required_checks:
      - Docs / docs

.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/README.md

@@ -1,5 +1,5 @@
 # Alignment package
 
 This packages provides tools for detector geometry alignment.
-Currently, the KalmanFitter-based alignment with internal minimization is implemented. 
-In the future, the minimization will be done based on the external minimization package e.g. Millepede. 
+Currently, the KalmanFitter-based alignment with internal minimization is implemented.
+In the future, the minimization will be done based on the external minimization package e.g. Millepede.

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

CI/README.md

@@ -8,4 +8,4 @@ Since [`poetry`](https://python-poetry.org) supports more robust dependency lock
 
 ```console
 poetry export -f requirements.txt > requirements.txt
-```
+```

CI/codespell_ignore.txt

@@ -21,4 +21,4 @@ ans
 dthe
 dthe
 vart
-pixelx
+pixelx