Merge branch 'main' into Multi-SensitiveVolume-MPGD

ybedfer · web-flow · commit 9e66406c1f23 · 2025-12-08T20:32:18.000+01:00
diff --git a/.github/workflows/check-geometry-configs.yml b/.github/workflows/check-geometry-configs.yml
@@ -11,7 +11,7 @@ jobs:
   check-geometry-configs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-fast-eic-shell
diff --git a/.github/workflows/check-tracking-geometry.yml b/.github/workflows/check-tracking-geometry.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         detector_config: ${{fromJson(inputs.detector_configs)}}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-fast-eic-shell
diff --git a/.github/workflows/convert-to-gdml.yml b/.github/workflows/convert-to-gdml.yml
@@ -11,7 +11,7 @@ jobs:
   convert-to-gdml:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-full-eic-shell
diff --git a/.github/workflows/convert-to-step.yml b/.github/workflows/convert-to-step.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         detector_config: ${{fromJson(inputs.detector_configs)}}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-fast-eic-shell
diff --git a/.github/workflows/convert-to-tgeo.yml b/.github/workflows/convert-to-tgeo.yml
@@ -11,7 +11,7 @@ jobs:
   convert-to-tgeo:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-full-eic-shell
diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml
@@ -18,7 +18,7 @@ jobs:
   xmllint-before-build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - run: |
         sudo apt-get update
         sudo apt-get install -y libxml2-utils
@@ -30,7 +30,7 @@ jobs:
       configs_csv: ${{ steps.list-detector-configs.outputs.configs_csv }}
       configs_json: ${{ steps.list-detector-configs.outputs.configs_json }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - id: list-detector-configs
       run: |
         CONFIGS_CSV=$(
@@ -66,7 +66,7 @@ jobs:
     env:
       PREFIX: ${{ github.workspace }}/install
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Prepare ccache timestamp
       id: ccache_cache_timestamp
       run: |
@@ -150,7 +150,7 @@ jobs:
       - build
       - check-tracking-geometry
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         ref: 25.07.0
     - uses: actions/download-artifact@v6
@@ -209,7 +209,7 @@ jobs:
       matrix:
         detector_config: [epic_craterlake]
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-full-eic-shell
@@ -236,7 +236,7 @@ jobs:
       matrix:
         detector_config: [epic_craterlake]
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-full-eic-shell
@@ -304,7 +304,7 @@ jobs:
         detector_config: [epic_craterlake, epic_ip6_extended] # FIXME
       fail-fast: false
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-full-eic-shell
@@ -326,7 +326,7 @@ jobs:
     needs: build
     if: github.ref == 'refs/heads/main'
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-full-eic-shell
@@ -361,7 +361,7 @@ jobs:
             tolerance_mm: 0.1
       fail-fast: false
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-full-eic-shell
@@ -386,7 +386,7 @@ jobs:
         detector_config: [epic_inner_detector, epic_craterlake]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-fast-eic-shell
@@ -447,7 +447,7 @@ jobs:
         detector_config: [epic_craterlake]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-fast-eic-shell
@@ -476,7 +476,7 @@ jobs:
         detector_config: [epic_craterlake]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: ${{ matrix.detector_config }}.prim
@@ -506,7 +506,7 @@ jobs:
         detector_config: [epic_craterlake]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: ${{ matrix.detector_config }}.prim
@@ -550,7 +550,7 @@ jobs:
         particle: [pi, e]
         detector_config: [epic_craterlake]
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-full-eic-shell
@@ -608,7 +608,7 @@ jobs:
         - beam: 5x41
           minq2: 1000
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         name: build-gcc-nightly-full-eic-shell
@@ -686,7 +686,7 @@ jobs:
     - merge-parameter-table
     - merge-dawn-view
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/download-artifact@v6
       with:
         path: artifacts/
diff --git a/.github/workflows/pr-backport.yml b/.github/workflows/pr-backport.yml
@@ -12,7 +12,7 @@ jobs:
     # Don't run on closed unmerged pull requests
     if: github.event.pull_request.merged
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Create backport pull requests
         uses: korthout/backport-action@v3
         with:
diff --git a/.github/workflows/spdx.yml b/.github/workflows/spdx.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
     - uses: enarx/spdx@266ce9351a52b27e4bce5e1dbeecb23498f33add
       with:
         licenses: LGPL-3.0-or-later
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v21.1.5
+    rev: v21.1.7
     hooks:
     -   id: clang-format
 -   repo: https://github.com/Lucas-C/pre-commit-hooks
diff --git a/compact/ecal/bic/bic_layer1_only.xml b/compact/ecal/bic/bic_layer1_only.xml
@@ -226,7 +226,7 @@
   <plugins>
     <plugin name="DD4hep_ParametersPlugin">
       <argument value="EcalBarrelImaging"/>
-      <argument value="layer_pattern: str=envelope"/>
+      <argument value="layer_pattern: str=envelope1"/>
     </plugin>
   </plugins>
 
diff --git a/compact/far_forward/B0_tracker.xml b/compact/far_forward/B0_tracker.xml
@@ -112,7 +112,7 @@
       </module>
       <layer id="1">
         <envelope  vis="FFTrackerLayerVis" rmin_tolerance="0*mm" rmax_tolerance="0*mm"
-                   zmin_tolerance="0*mm" zmax_tolerance="0*mm" length="1.0*cm"
+                   zmin_tolerance="1*mm" zmax_tolerance="1*mm" length="1.0*cm"
                    zstart="B0TrackerLayer1_zstart" />
         <ring phi0="B0TrackerLayerBigMod_phi0" dphi="B0TrackerModOpeningAngle"
           r="B0TrackerMod1Inner_r+B0TrackerMod1_y/2.0" zstart="0.0*mm"
@@ -125,7 +125,7 @@
       </layer>
       <layer id="2" >
         <envelope vis="FFTrackerLayerVis" rmin_tolerance="0*mm" rmax_tolerance="0*mm"
-                  zmin_tolerance="0*mm" zmax_tolerance="0*mm" length="1.0*cm"
+                  zmin_tolerance="1*mm" zmax_tolerance="1*mm" length="1.0*cm"
                   zstart="B0TrackerLayer2_zstart" />
         <ring phi0="B0TrackerLayerBigMod_phi0" dphi="B0TrackerModOpeningAngle"
           r="B0TrackerMod1Inner_r+B0TrackerMod1_y/2.0" zstart="0.0*mm"
@@ -138,7 +138,7 @@
       </layer>
       <layer id="3" >
         <envelope vis="FFTrackerLayerVis" rmin_tolerance="0*mm" rmax_tolerance="0*mm"
-                  zmin_tolerance="0*mm" zmax_tolerance="0*mm" length="1.0*cm"
+                  zmin_tolerance="1*mm" zmax_tolerance="1*mm" length="1.0*cm"
                   zstart="B0TrackerLayer3_zstart" />
         <ring phi0="B0TrackerLayerBigMod_phi0" dphi="B0TrackerModOpeningAngle"
           r="B0TrackerMod1Inner_r+B0TrackerMod1_y/2.0" zstart="0.0*mm"
@@ -151,7 +151,7 @@
       </layer>
       <layer id="4" >
         <envelope vis="FFTrackerLayerVis" rmin_tolerance="0*mm" rmax_tolerance="0*mm"
-                  zmin_tolerance="0*cm" zmax_tolerance="0*cm" length="1.0*cm"
+                  zmin_tolerance="1*mm" zmax_tolerance="1*mm" length="1.0*cm"
                   zstart="B0TrackerLayer4_zstart" />
         <ring phi0="B0TrackerLayerBigMod_phi0" dphi="B0TrackerModOpeningAngle"
           r="B0TrackerMod1Inner_r+B0TrackerMod1_y/2.0" zstart="0.0*mm"
diff --git a/src/B0Tracker_geo.cpp b/src/B0Tracker_geo.cpp
@@ -53,7 +53,7 @@ static Ref_t create_B0Tracker(Detector& description, xml_h e, SensitiveDetector
                                                     "boundary_material");
   }
 
-  assembly.setVisAttributes(description.invisible());
+  assembly.setVisAttributes("InvisibleWithDaughters");
   sens.setType("tracker");
 
   for (xml_coll_t mi(x_det, _U(module)); mi; ++mi, ++m_id) {
diff --git a/src/BackwardsLumiVac_geo.cpp b/src/BackwardsLumiVac_geo.cpp
diff --git a/src/ZeroDegreeCalorimeterEcal_geo.cpp b/src/ZeroDegreeCalorimeterEcal_geo.cpp
