Skip to content

Commit 54b0912

Browse files
authored
Merge branch 'main' into Add-dipole-steering-magnets-based-on-CAD
2 parents 9ae66a2 + 51e563c commit 54b0912

File tree

8 files changed

+58
-53
lines changed

8 files changed

+58
-53
lines changed

.github/workflows/check-geometry-configs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v5
15-
- uses: actions/download-artifact@v5
15+
- uses: actions/download-artifact@v6
1616
with:
1717
name: build-gcc-nightly-fast-eic-shell
1818
path: install/

.github/workflows/check-tracking-geometry.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
detector_config: ${{fromJson(inputs.detector_configs)}}
1616
steps:
1717
- uses: actions/checkout@v5
18-
- uses: actions/download-artifact@v5
18+
- uses: actions/download-artifact@v6
1919
with:
2020
name: build-gcc-nightly-fast-eic-shell
2121
path: install/
@@ -29,13 +29,13 @@ jobs:
2929
/usr/bin/time -v \
3030
root -b -q "scripts/test_ACTS.cxx+(\"${DETECTOR_PATH}/${{matrix.detector_config}}.xml\")" | tee check_tracking_geometry.out
3131
bin/acts_geo_check check_tracking_geometry.out
32-
- uses: actions/upload-artifact@v4
32+
- uses: actions/upload-artifact@v5
3333
with:
3434
name: ${{matrix.detector_config}}.obj
3535
path: |
3636
*.obj
3737
*.mpl
38-
- uses: actions/upload-artifact@v4
38+
- uses: actions/upload-artifact@v5
3939
with:
4040
name: ${{matrix.detector_config}}.ply
4141
path: |

.github/workflows/convert-to-gdml.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v5
15-
- uses: actions/download-artifact@v5
15+
- uses: actions/download-artifact@v6
1616
with:
1717
name: build-gcc-nightly-full-eic-shell
1818
path: install/
@@ -29,7 +29,7 @@ jobs:
2929
geoConverter -compact2gdml -input ${DETECTOR_PATH}/${config}.xml -output ${config}.gdml ;
3030
echo "::endgroup::" ;
3131
done
32-
- uses: actions/upload-artifact@v4
32+
- uses: actions/upload-artifact@v5
3333
with:
3434
name: gdml
3535
path: "*.gdml"

.github/workflows/convert-to-step.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
detector_config: ${{fromJson(inputs.detector_configs)}}
1616
steps:
1717
- uses: actions/checkout@v5
18-
- uses: actions/download-artifact@v5
18+
- uses: actions/download-artifact@v6
1919
with:
2020
name: build-gcc-nightly-fast-eic-shell
2121
path: install/
@@ -38,7 +38,7 @@ jobs:
3838
detectors[OuterBarrelMPGDSubAssembly]='-l 4'
3939
# Export to one STEP file
4040
npdet_to_step $(for d in ${!detectors[@]} ; do echo part ${detectors[$d]} $d ; done) -o ${{matrix.detector_config}} $DETECTOR_PATH/${{matrix.detector_config}}.xml 2>&1 | sed '/TGeoMatrix::dtor/d'
41-
- uses: actions/upload-artifact@v4
41+
- uses: actions/upload-artifact@v5
4242
with:
4343
name: ${{matrix.detector_config}}.stp
4444
path: ${{matrix.detector_config}}.stp

.github/workflows/convert-to-tgeo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v5
15-
- uses: actions/download-artifact@v5
15+
- uses: actions/download-artifact@v6
1616
with:
1717
name: build-gcc-nightly-full-eic-shell
1818
path: install/
@@ -29,7 +29,7 @@ jobs:
2929
geoConverter -compact2tgeo -input ${DETECTOR_PATH}/${config}.xml -output ${config}.root
3030
echo "::endgroup::" ;
3131
done
32-
- uses: actions/upload-artifact@v4
32+
- uses: actions/upload-artifact@v5
3333
with:
3434
name: tgeo
3535
path: "*.root"

.github/workflows/linux-eic-shell.yml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
run: |
102102
CC=${{ matrix.CC }} CXX=${{ matrix.CXX }} cmake -B build -S . -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
103103
cmake --build build -- -k -j $(getconf _NPROCESSORS_ONLN) install
104-
- uses: actions/upload-artifact@v4
104+
- uses: actions/upload-artifact@v5
105105
with:
106106
name: build-${{ matrix.CC }}-${{ matrix.release }}-full-eic-shell
107107
path: install/
@@ -113,7 +113,7 @@ jobs:
113113
${DETECTOR_PATH}/compact/ecal/forward_scfi.xml \
114114
${DETECTOR_PATH}/compact/far_forward/ZDC_Ecal_WSciFi.xml \
115115
${DETECTOR_PATH}/compact/pid/mrich.xml
116-
- uses: actions/upload-artifact@v4
116+
- uses: actions/upload-artifact@v5
117117
with:
118118
name: build-${{ matrix.CC }}-${{ matrix.release }}-fast-eic-shell
119119
path: install/
@@ -123,7 +123,7 @@ jobs:
123123
runs-on: ubuntu-latest
124124
needs: build
125125
steps:
126-
- uses: actions/download-artifact@v5
126+
- uses: actions/download-artifact@v6
127127
with:
128128
name: build-gcc-nightly-full-eic-shell
129129
path: install/
@@ -155,7 +155,7 @@ jobs:
155155
- uses: actions/checkout@v5
156156
with:
157157
ref: 25.07.0
158-
- uses: actions/download-artifact@v5
158+
- uses: actions/download-artifact@v6
159159
with:
160160
name: build-gcc-25.07.0-stable-full-eic-shell
161161
path: install/
@@ -169,7 +169,7 @@ jobs:
169169
export DETECTOR_CONFIG=epic_craterlake_material_map_25_07_0
170170
./run_material_map_validation.sh --nevents 500
171171
popd
172-
- uses: actions/upload-artifact@v4
172+
- uses: actions/upload-artifact@v5
173173
with:
174174
name: material_map
175175
path: |
@@ -212,7 +212,7 @@ jobs:
212212
detector_config: [epic_craterlake]
213213
steps:
214214
- uses: actions/checkout@v5
215-
- uses: actions/download-artifact@v5
215+
- uses: actions/download-artifact@v6
216216
with:
217217
name: build-gcc-nightly-full-eic-shell
218218
path: install/
@@ -225,7 +225,7 @@ jobs:
225225
run: |
226226
mkdir -p doc
227227
npdet_info dump ${DETECTOR_PATH}/${{matrix.detector_config}}.xml | tee doc/${{matrix.detector_config}}_constants.out
228-
- uses: actions/upload-artifact@v4
228+
- uses: actions/upload-artifact@v5
229229
with:
230230
name: ${{matrix.detector_config}}_constants.out
231231
path: doc/${{matrix.detector_config}}_constants.out
@@ -239,7 +239,7 @@ jobs:
239239
detector_config: [epic_craterlake]
240240
steps:
241241
- uses: actions/checkout@v5
242-
- uses: actions/download-artifact@v5
242+
- uses: actions/download-artifact@v6
243243
with:
244244
name: build-gcc-nightly-full-eic-shell
245245
path: install/
@@ -261,12 +261,12 @@ jobs:
261261
".output doc/${{matrix.detector_config}}.html" \
262262
"select * from detector_parameter_table;"
263263
sed -i '1s/^/<html><body><table border="1" style="border-collapse:collapse">\n/;$a</table></body></html>' doc/${{matrix.detector_config}}.html
264-
- uses: actions/upload-artifact@v4
264+
- uses: actions/upload-artifact@v5
265265
with:
266266
name: ${{matrix.detector_config}}_constants.toml
267267
path: doc/${{matrix.detector_config}}_constants.toml
268268
if-no-files-found: error
269-
- uses: actions/upload-artifact@v4
269+
- uses: actions/upload-artifact@v5
270270
with:
271271
name: ${{matrix.detector_config}}_DetectorParameterTable
272272
path: |
@@ -280,7 +280,7 @@ jobs:
280280
- dump-constants
281281
- dump-parameter-table
282282
steps:
283-
- uses: actions/upload-artifact/merge@v4
283+
- uses: actions/upload-artifact/merge@v5
284284
with:
285285
name: constants
286286
pattern: '*_constants.*'
@@ -291,7 +291,7 @@ jobs:
291291
needs:
292292
- dump-parameter-table
293293
steps:
294-
- uses: actions/upload-artifact/merge@v4
294+
- uses: actions/upload-artifact/merge@v5
295295
with:
296296
name: DetectorParameterTable
297297
pattern: '*_DetectorParameterTable'
@@ -307,7 +307,7 @@ jobs:
307307
fail-fast: false
308308
steps:
309309
- uses: actions/checkout@v5
310-
- uses: actions/download-artifact@v5
310+
- uses: actions/download-artifact@v6
311311
with:
312312
name: build-gcc-nightly-full-eic-shell
313313
path: install/
@@ -329,7 +329,7 @@ jobs:
329329
if: github.ref == 'refs/heads/main'
330330
steps:
331331
- uses: actions/checkout@v5
332-
- uses: actions/download-artifact@v5
332+
- uses: actions/download-artifact@v6
333333
with:
334334
name: build-gcc-nightly-full-eic-shell
335335
path: install/
@@ -342,7 +342,7 @@ jobs:
342342
mkdir -p doc
343343
checkGeometry -f true -c ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml | tee geometry_check_full.out
344344
mv statistics.root geometry_check_full.root
345-
- uses: actions/upload-artifact@v4
345+
- uses: actions/upload-artifact@v5
346346
with:
347347
name: check-geometry-full
348348
path: |
@@ -364,7 +364,7 @@ jobs:
364364
fail-fast: false
365365
steps:
366366
- uses: actions/checkout@v5
367-
- uses: actions/download-artifact@v5
367+
- uses: actions/download-artifact@v6
368368
with:
369369
name: build-gcc-nightly-full-eic-shell
370370
path: install/
@@ -389,7 +389,7 @@ jobs:
389389
fail-fast: false
390390
steps:
391391
- uses: actions/checkout@v5
392-
- uses: actions/download-artifact@v5
392+
- uses: actions/download-artifact@v6
393393
with:
394394
name: build-gcc-nightly-fast-eic-shell
395395
path: install/
@@ -450,7 +450,7 @@ jobs:
450450
fail-fast: false
451451
steps:
452452
- uses: actions/checkout@v5
453-
- uses: actions/download-artifact@v5
453+
- uses: actions/download-artifact@v6
454454
with:
455455
name: build-gcc-nightly-fast-eic-shell
456456
path: install/
@@ -462,7 +462,7 @@ jobs:
462462
setup: install/bin/thisepic.sh
463463
run: |
464464
bin/generate_prim_file -c $DETECTOR_PATH/${{ matrix.detector_config }}.xml -o prim -D -t ${{ matrix.detector_config }}
465-
- uses: actions/upload-artifact@v4
465+
- uses: actions/upload-artifact@v5
466466
with:
467467
name: ${{ matrix.detector_config }}.prim
468468
path: prim/${{ matrix.detector_config }}.prim
@@ -479,7 +479,7 @@ jobs:
479479
fail-fast: false
480480
steps:
481481
- uses: actions/checkout@v5
482-
- uses: actions/download-artifact@v5
482+
- uses: actions/download-artifact@v6
483483
with:
484484
name: ${{ matrix.detector_config }}.prim
485485
path: prim/
@@ -491,7 +491,7 @@ jobs:
491491
run: |
492492
mkdir -p images
493493
bin/make_dawn_views -i prim/${{ matrix.detector_config }}.prim -t ${{ matrix.view }} -d scripts/${{ matrix.view }} -D
494-
- uses: actions/upload-artifact@v4
494+
- uses: actions/upload-artifact@v5
495495
with:
496496
name: ${{ matrix.detector_config }}_views_${{ matrix.view }}
497497
path: images/
@@ -509,7 +509,7 @@ jobs:
509509
fail-fast: false
510510
steps:
511511
- uses: actions/checkout@v5
512-
- uses: actions/download-artifact@v5
512+
- uses: actions/download-artifact@v6
513513
with:
514514
name: ${{ matrix.detector_config }}.prim
515515
path: prim/
@@ -521,7 +521,7 @@ jobs:
521521
run: |
522522
mkdir -p images
523523
bin/make_dawn_views -i prim/${{ matrix.detector_config }}.prim -t ${{ matrix.view }} -d scripts/${{ matrix.view }} -D -- ${{ matrix.slice }}
524-
- uses: actions/upload-artifact@v4
524+
- uses: actions/upload-artifact@v5
525525
with:
526526
name: ${{ matrix.detector_config }}_views_${{ matrix.view }}_${{ matrix.slice }}
527527
path: images/
@@ -538,7 +538,7 @@ jobs:
538538
matrix:
539539
detector_config: [epic_craterlake]
540540
steps:
541-
- uses: actions/upload-artifact/merge@v4
541+
- uses: actions/upload-artifact/merge@v5
542542
with:
543543
name: ${{ matrix.detector_config }}_views
544544
pattern: ${{ matrix.detector_config }}_views_*
@@ -553,7 +553,7 @@ jobs:
553553
detector_config: [epic_craterlake]
554554
steps:
555555
- uses: actions/checkout@v5
556-
- uses: actions/download-artifact@v5
556+
- uses: actions/download-artifact@v6
557557
with:
558558
name: build-gcc-nightly-full-eic-shell
559559
path: install/
@@ -565,7 +565,7 @@ jobs:
565565
setup: install/bin/thisepic.sh
566566
run: |
567567
npsim --compactFile ${DETECTOR_PATH}/${{ matrix.detector_config }}.xml -G --random.seed 1 --gun.particle "${{ matrix.particle }}-" --gun.momentumMin "1*GeV" --gun.momentumMax "20*GeV" --gun.distribution "uniform" -N 100 --outputFile sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root -v WARNING
568-
- uses: actions/upload-artifact@v4
568+
- uses: actions/upload-artifact@v5
569569
with:
570570
name: sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root
571571
path: sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root
@@ -590,7 +590,7 @@ jobs:
590590
capybara bara ref/sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root* sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root
591591
mv capybara-reports sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}
592592
touch .sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}
593-
- uses: actions/upload-artifact@v4
593+
- uses: actions/upload-artifact@v5
594594
with:
595595
name: sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.capy
596596
path: |
@@ -611,7 +611,7 @@ jobs:
611611
minq2: 1000
612612
steps:
613613
- uses: actions/checkout@v5
614-
- uses: actions/download-artifact@v5
614+
- uses: actions/download-artifact@v6
615615
with:
616616
name: build-gcc-nightly-full-eic-shell
617617
path: install/
@@ -627,13 +627,13 @@ jobs:
627627
npsim --compactFile ${DETECTOR_PATH}/${{ matrix.detector_config }}.xml -N 100 --inputFiles ${url} --random.seed 1 --outputFile sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.edm4hep.root -v WARNING
628628
gprofng display text -ctree sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.er > sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.ctree.txt
629629
- name: Upload ROOT output
630-
uses: actions/upload-artifact@v4
630+
uses: actions/upload-artifact@v5
631631
with:
632632
name: sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.edm4hep.root
633633
path: sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.edm4hep.root
634634
if-no-files-found: error
635635
- name: Upload call tree
636-
uses: actions/upload-artifact@v4
636+
uses: actions/upload-artifact@v5
637637
with:
638638
name: sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.ctree.txt
639639
path: sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.ctree.txt
@@ -658,7 +658,7 @@ jobs:
658658
capybara bara ref/sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.edm4hep.root* sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.edm4hep.root
659659
mv capybara-reports sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}
660660
touch .sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}
661-
- uses: actions/upload-artifact@v4
661+
- uses: actions/upload-artifact@v5
662662
with:
663663
name: sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.capy
664664
path: |
@@ -672,7 +672,7 @@ jobs:
672672
- npsim-gun
673673
- npsim-dis
674674
steps:
675-
- uses: actions/upload-artifact/merge@v4
675+
- uses: actions/upload-artifact/merge@v5
676676
with:
677677
name: capybara-report
678678
pattern: |
@@ -689,7 +689,7 @@ jobs:
689689
- merge-dawn-view
690690
steps:
691691
- uses: actions/checkout@v5
692-
- uses: actions/download-artifact@v5
692+
- uses: actions/download-artifact@v6
693693
with:
694694
path: artifacts/
695695
- uses: actions/jekyll-build-pages@v1

compact/hcal/barrel_gdml.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
<tile6_gdmlfile file="gdml/Tile06_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile06_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
3434
<tile7_gdmlfile file="gdml/Tile07_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile07_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
3535
<tile8_gdmlfile file="gdml/Tile08_Reduced.gdml" url="https://github.com/eic/epic-data/raw/582c777d1f17886da4619b1a2b047c507db43672/barrel_HCAL_gdml/tiles/Tile08_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
36-
<tile9_gdmlfile file="gdml/Tile09_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile09_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
37-
<tile10_gdmlfile file="gdml/Tile10_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile10_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
38-
<tile11_gdmlfile file="gdml/Tile11_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile11_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
39-
<tile12_gdmlfile file="gdml/Tile12_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/Tile12_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
36+
<tile9_gdmlfile file="gdml/Tile09_Reduced.gdml" url="https://github.com/eic/epic-data/raw/66733a76b758ce9d85d270e59fdd560f84bc70ec/barrel_HCAL_gdml/tiles/Tile09_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
37+
<tile10_gdmlfile file="gdml/Tile10_Reduced.gdml" url="https://github.com/eic/epic-data/raw/66733a76b758ce9d85d270e59fdd560f84bc70ec/barrel_HCAL_gdml/tiles/Tile10_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
38+
<tile11_gdmlfile file="gdml/Tile11_Reduced.gdml" url="https://github.com/eic/epic-data/raw/66733a76b758ce9d85d270e59fdd560f84bc70ec/barrel_HCAL_gdml/tiles/Tile11_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
39+
<tile12_gdmlfile file="gdml/Tile12_Reduced.gdml" url="https://github.com/eic/epic-data/raw/66733a76b758ce9d85d270e59fdd560f84bc70ec/barrel_HCAL_gdml/tiles/Tile12_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
4040
<ctile9_gdmlfile file="gdml/CTile09_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/CTile09_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
4141
<ctile10_gdmlfile file="gdml/CTile10_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/CTile10_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>
4242
<ctile11_gdmlfile file="gdml/CTile11_Reduced.gdml" url="https://github.com/eic/epic-data/raw/2edf54d71b069acb81d969a75717427a0bf77217/barrel_HCAL_gdml/tiles/CTile11_Reduced.gdml" cache="$DETECTOR_PATH:/opt/detector" material="PlasticScint"/>

0 commit comments

Comments
 (0)