From b67f91459bc9d3344209428a043dee2e3cb9ab6d Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Wed, 15 Jan 2025 18:18:01 +0100 Subject: [PATCH 1/3] fix: Add portal visualization to `TrackingVolume` (#4029) --- Core/src/Geometry/TrackingVolume.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Core/src/Geometry/TrackingVolume.cpp b/Core/src/Geometry/TrackingVolume.cpp index 21c22fa8c8d..3bc8deb675d 100644 --- a/Core/src/Geometry/TrackingVolume.cpp +++ b/Core/src/Geometry/TrackingVolume.cpp @@ -746,6 +746,10 @@ void TrackingVolume::visualize(IVisualization3D& helper, surface.visualize(helper, gctx, sensitiveViewConfig); } + for (const auto& portal : portals()) { + portal.surface().visualize(helper, gctx, portalViewConfig); + } + for (const auto& child : volumes()) { child.visualize(helper, gctx, viewConfig, portalViewConfig, sensitiveViewConfig); From 1166f22365b33970429b9b9bfa3a83a9d535ad02 Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Wed, 15 Jan 2025 20:47:41 +0100 Subject: [PATCH 2/3] ci: Use CERN registry cache in GitLab CI - round 2 (#4023) Seems to be back up. --- .gitlab-ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f1e13c1b1a..e768c23ee88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: clang_tidy: stage: build - image: ghcr.io/acts-project/ubuntu2404:63 + image: registry.cern.ch/ghcr.io/acts-project/ubuntu2404:63 tags: - large artifacts: @@ -71,7 +71,7 @@ clang_tidy: build_exatrkx_cpu: stage: build - image: ghcr.io/acts-project/ubuntu2204_exatrkx:63 + image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204_exatrkx:63 variables: DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst tags: @@ -104,7 +104,7 @@ build_exatrkx_cpu: build_exatrkx: stage: build - image: ghcr.io/acts-project/ubuntu2204_exatrkx:63 + image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204_exatrkx:63 variables: DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst tags: @@ -146,7 +146,7 @@ test_exatrkx_unittests: stage: test needs: - build_exatrkx - image: ghcr.io/acts-project/ubuntu2204_exatrkx:63 + image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204_exatrkx:63 variables: DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst tags: @@ -165,7 +165,7 @@ test_exatrkx_python: stage: test needs: - build_exatrkx - image: ghcr.io/acts-project/ubuntu2204_exatrkx:63 + image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204_exatrkx:63 variables: DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst tags: @@ -188,7 +188,7 @@ test_exatrkx_python: build_linux_ubuntu: stage: build - image: ghcr.io/acts-project/ubuntu2404:63 + image: registry.cern.ch/ghcr.io/acts-project/ubuntu2404:63 variables: DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst @@ -228,7 +228,7 @@ build_linux_ubuntu: linux_test_examples: stage: test - image: ghcr.io/acts-project/ubuntu2404:63 + image: registry.cern.ch/ghcr.io/acts-project/ubuntu2404:63 variables: DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst needs: [build_linux_ubuntu] @@ -252,7 +252,7 @@ linux_test_examples: linux_physmon: stage: test - image: ghcr.io/acts-project/ubuntu2404:63 + image: registry.cern.ch/ghcr.io/acts-project/ubuntu2404:63 variables: DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst needs: [build_linux_ubuntu] @@ -347,14 +347,14 @@ linux_ubuntu_2204: variables: CXXSTD: 20 DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst - image: ghcr.io/acts-project/ubuntu2204:63 + image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204:63 linux_ubuntu_2204_clang: extends: .linux_ubuntu_extra variables: CXXSTD: 20 DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst - image: ghcr.io/acts-project/ubuntu2204_clang:63 + image: registry.cern.ch/ghcr.io/acts-project/ubuntu2204_clang:63 ###################### @@ -362,7 +362,7 @@ linux_ubuntu_2204_clang: ###################### .lcg_base_job: - image: ghcr.io/acts-project/${OS}-base:63 + image: registry.cern.ch/ghcr.io/acts-project/${OS}-base:63 stage: build tags: - cvmfs From ba5a781bbabb6a25278b494cd0c784bf3d39e2a3 Mon Sep 17 00:00:00 2001 From: Paul Gessinger Date: Wed, 15 Jan 2025 22:23:50 +0100 Subject: [PATCH 3/3] build: Only install python files for enabled components (#4004) --- Examples/Python/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Examples/Python/CMakeLists.txt b/Examples/Python/CMakeLists.txt index acca27e91f4..610efe57c17 100644 --- a/Examples/Python/CMakeLists.txt +++ b/Examples/Python/CMakeLists.txt @@ -268,9 +268,11 @@ foreach(f ${py_files}) CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/python/acts/${f} ${_target} SYMBOLIC ) -endforeach() -install( - DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python/acts/ - DESTINATION ${_python_install_dir} -) + get_filename_component(_rel ${f} DIRECTORY) + + install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/python/acts/${f} + DESTINATION ${_python_install_dir}/${_rel} + ) +endforeach()