Skip to content

Commit 2427f5d

Browse files
ruse-travelerruse-traveler
committed
Merge branch 'main' into add-missing-det-type-tags
2 parents 36c4aa5 + ab4f651 commit 2427f5d

File tree

65 files changed

+636
-762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+636
-762
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
check-geometry-configs:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515
- uses: actions/download-artifact@v6
1616
with:
1717
name: build-gcc-nightly-fast-eic-shell

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
detector_config: ${{fromJson(inputs.detector_configs)}}
1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818
- uses: actions/download-artifact@v6
1919
with:
2020
name: build-gcc-nightly-fast-eic-shell

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
convert-to-gdml:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515
- uses: actions/download-artifact@v6
1616
with:
1717
name: build-gcc-nightly-full-eic-shell

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
detector_config: ${{fromJson(inputs.detector_configs)}}
1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818
- uses: actions/download-artifact@v6
1919
with:
2020
name: build-gcc-nightly-fast-eic-shell

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
convert-to-tgeo:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515
- uses: actions/download-artifact@v6
1616
with:
1717
name: build-gcc-nightly-full-eic-shell

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

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
xmllint-before-build:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v5
21+
- uses: actions/checkout@v6
2222
- run: |
2323
sudo apt-get update
2424
sudo apt-get install -y libxml2-utils
@@ -30,7 +30,7 @@ jobs:
3030
configs_csv: ${{ steps.list-detector-configs.outputs.configs_csv }}
3131
configs_json: ${{ steps.list-detector-configs.outputs.configs_json }}
3232
steps:
33-
- uses: actions/checkout@v5
33+
- uses: actions/checkout@v6
3434
- id: list-detector-configs
3535
run: |
3636
CONFIGS_CSV=$(
@@ -66,7 +66,7 @@ jobs:
6666
env:
6767
PREFIX: ${{ github.workspace }}/install
6868
steps:
69-
- uses: actions/checkout@v5
69+
- uses: actions/checkout@v6
7070
- name: Prepare ccache timestamp
7171
id: ccache_cache_timestamp
7272
run: |
@@ -110,7 +110,6 @@ jobs:
110110
source install/bin/thisepic.sh
111111
sed -i 's%\(<fiber\|<lens\)%<comment>\1%g; s%\(/fiber>\|/lens>\)%\1</comment>%g' \
112112
${DETECTOR_PATH}/compact/ecal/bic_default.xml \
113-
${DETECTOR_PATH}/compact/ecal/forward_scfi.xml \
114113
${DETECTOR_PATH}/compact/far_forward/ZDC_Ecal_WSciFi.xml
115114
- uses: actions/upload-artifact@v5
116115
with:
@@ -151,7 +150,7 @@ jobs:
151150
- build
152151
- check-tracking-geometry
153152
steps:
154-
- uses: actions/checkout@v5
153+
- uses: actions/checkout@v6
155154
with:
156155
ref: 25.07.0
157156
- uses: actions/download-artifact@v6
@@ -210,7 +209,7 @@ jobs:
210209
matrix:
211210
detector_config: [epic_craterlake]
212211
steps:
213-
- uses: actions/checkout@v5
212+
- uses: actions/checkout@v6
214213
- uses: actions/download-artifact@v6
215214
with:
216215
name: build-gcc-nightly-full-eic-shell
@@ -237,7 +236,7 @@ jobs:
237236
matrix:
238237
detector_config: [epic_craterlake]
239238
steps:
240-
- uses: actions/checkout@v5
239+
- uses: actions/checkout@v6
241240
- uses: actions/download-artifact@v6
242241
with:
243242
name: build-gcc-nightly-full-eic-shell
@@ -305,7 +304,7 @@ jobs:
305304
detector_config: [epic_craterlake, epic_ip6_extended] # FIXME
306305
fail-fast: false
307306
steps:
308-
- uses: actions/checkout@v5
307+
- uses: actions/checkout@v6
309308
- uses: actions/download-artifact@v6
310309
with:
311310
name: build-gcc-nightly-full-eic-shell
@@ -327,7 +326,7 @@ jobs:
327326
needs: build
328327
if: github.ref == 'refs/heads/main'
329328
steps:
330-
- uses: actions/checkout@v5
329+
- uses: actions/checkout@v6
331330
- uses: actions/download-artifact@v6
332331
with:
333332
name: build-gcc-nightly-full-eic-shell
@@ -362,7 +361,7 @@ jobs:
362361
tolerance_mm: 0.1
363362
fail-fast: false
364363
steps:
365-
- uses: actions/checkout@v5
364+
- uses: actions/checkout@v6
366365
- uses: actions/download-artifact@v6
367366
with:
368367
name: build-gcc-nightly-full-eic-shell
@@ -387,7 +386,7 @@ jobs:
387386
detector_config: [epic_inner_detector, epic_craterlake]
388387
fail-fast: false
389388
steps:
390-
- uses: actions/checkout@v5
389+
- uses: actions/checkout@v6
391390
- uses: actions/download-artifact@v6
392391
with:
393392
name: build-gcc-nightly-fast-eic-shell
@@ -448,7 +447,7 @@ jobs:
448447
detector_config: [epic_craterlake]
449448
fail-fast: false
450449
steps:
451-
- uses: actions/checkout@v5
450+
- uses: actions/checkout@v6
452451
- uses: actions/download-artifact@v6
453452
with:
454453
name: build-gcc-nightly-fast-eic-shell
@@ -477,7 +476,7 @@ jobs:
477476
detector_config: [epic_craterlake]
478477
fail-fast: false
479478
steps:
480-
- uses: actions/checkout@v5
479+
- uses: actions/checkout@v6
481480
- uses: actions/download-artifact@v6
482481
with:
483482
name: ${{ matrix.detector_config }}.prim
@@ -507,7 +506,7 @@ jobs:
507506
detector_config: [epic_craterlake]
508507
fail-fast: false
509508
steps:
510-
- uses: actions/checkout@v5
509+
- uses: actions/checkout@v6
511510
- uses: actions/download-artifact@v6
512511
with:
513512
name: ${{ matrix.detector_config }}.prim
@@ -551,7 +550,7 @@ jobs:
551550
particle: [pi, e]
552551
detector_config: [epic_craterlake]
553552
steps:
554-
- uses: actions/checkout@v5
553+
- uses: actions/checkout@v6
555554
- uses: actions/download-artifact@v6
556555
with:
557556
name: build-gcc-nightly-full-eic-shell
@@ -609,7 +608,7 @@ jobs:
609608
- beam: 5x41
610609
minq2: 1000
611610
steps:
612-
- uses: actions/checkout@v5
611+
- uses: actions/checkout@v6
613612
- uses: actions/download-artifact@v6
614613
with:
615614
name: build-gcc-nightly-full-eic-shell
@@ -687,7 +686,7 @@ jobs:
687686
- merge-parameter-table
688687
- merge-dawn-view
689688
steps:
690-
- uses: actions/checkout@v5
689+
- uses: actions/checkout@v6
691690
- uses: actions/download-artifact@v6
692691
with:
693692
path: artifacts/

‎.github/workflows/pr-backport.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
# Don't run on closed unmerged pull requests
1313
if: github.event.pull_request.merged
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
- name: Create backport pull requests
1717
uses: korthout/backport-action@v3
1818
with:

‎.github/workflows/spdx.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: checkout
11-
uses: actions/checkout@v5
11+
uses: actions/checkout@v6
1212
- uses: enarx/spdx@266ce9351a52b27e4bce5e1dbeecb23498f33add
1313
with:
1414
licenses: LGPL-3.0-or-later

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repos:
66
- id: end-of-file-fixer
77
- id: trailing-whitespace
88
- repo: https://github.com/pre-commit/mirrors-clang-format
9-
rev: v21.1.5
9+
rev: v21.1.6
1010
hooks:
1111
- id: clang-format
1212
- repo: https://github.com/Lucas-C/pre-commit-hooks

‎compact/definitions.xml‎

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ Examples:
544544
Service gaps in FW direction (before endcapP ECAL) and BW direction (before endcapN HCAL)
545545
</documentation>
546546
<constant name="ForwardInnerEndcapRegionExtraSpace_length" value="4.6*cm"/>
547-
<constant name="ForwardServiceGap_length" value="12.36*cm"/>
547+
<constant name="ForwardServiceGap_length" value="15.4*cm"/>
548548
<constant name="ForwardServiceGap_zmin" value="ForwardPIDRegion_zmin + ForwardInnerEndcapRegion_length + ForwardInnerEndcapRegionExtraSpace_length"/>
549549
<constant name="ForwardServiceGap_zmax" value="ForwardServiceGap_zmin + ForwardServiceGap_length"/>
550550

@@ -561,25 +561,39 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
561561
<documentation level="3">
562562
## Calorimeter Parameters
563563
</documentation>
564-
<constant name="EcalBarrelSectorsN" value="48"/>
565-
<constant name="EcalEndcapP_zmin" value="ForwardServiceGap_zmax" />
566-
<constant name="EcalEndcapP_length" value="30*cm" />
567-
<constant name="EcalEndcapP_zmax" value="EcalEndcapP_zmin + EcalEndcapP_length"/>
568-
<constant name="EcalEndcapP_rmin" value="200.0*mm" />
569-
<comment> extra 50cm rmax that "protrudes" into the HCAL</comment>
570-
<constant name="EcalEndcapP_rmax" value="195.0*cm"/>
571-
<constant name="EcalEndcapP_numLayers" value="1"/>
572-
573-
<constant name="EcalEndcapPInsert_zmin" value="EcalEndcapP_zmin"/>
574-
<constant name="EcalEndcapPInsert_length" value="EcalEndcapP_length"/>
575-
<constant name="EcalEndcapPInsert_zmax" value="EcalEndcapPInsert_zmin + EcalEndcapPInsert_length"/>
576-
<constant name="EcalEndcapPInsert_width" value="60.0*cm"/>
577-
<constant name="EcalEndcapPInsert_height" value="60.0*cm"/>
578-
<constant name="EcalEndcapPInsert_xposition" value="-10.0*cm"/>
579-
<constant name="EcalEndcapPInsert_yposition" value="0.0*cm"/>
580-
<constant name="EcalEndcapPInsert_hole_radius" value="14.61*cm"/>
581-
<constant name="EcalEndcapPInsert_hole_xposition" value="-7.20*cm"/>
582-
<constant name="EcalEndcapPInsert_hole_yposition" value="0.0*cm"/>
564+
<constant name="EcalBarrelSectorsN" value="48"/>
565+
566+
<constant name="EcalEndcapP_numLayers" value="1"/>
567+
<constant name="EcalEndcapP_zmin" value="ForwardServiceGap_zmax"/>
568+
<constant name="EcalEndcapP_CoverThickness" value="0.343*mm"/>
569+
<constant name="EcalEndcapP_AirThickness" value="61.457*mm"/>
570+
<constant name="EcalEndcapP_PCBThickness" value="4.5*mm"/>
571+
<constant name="EcalEndcapP_LightGuideThickness" value="21.0*mm"/>
572+
<constant name="EcalEndcapP_ScintillatorThickness" value="170.0*mm"/>
573+
<constant name="EcalEndcapP_MountingPlateThickness" value="12.7*mm"/>
574+
<constant name="EcalEndcapP_length" value="EcalEndcapP_CoverThickness+EcalEndcapP_AirThickness+EcalEndcapP_PCBThickness+EcalEndcapP_LightGuideThickness+EcalEndcapP_ScintillatorThickness+EcalEndcapP_MountingPlateThickness"/>
575+
<constant name="EcalEndcapP_zmax" value="EcalEndcapP_zmin + EcalEndcapP_length"/>
576+
<constant name="EcalEndcapP_xOffsetNorth" value="0.685/2.0*cm"/>
577+
<constant name="EcalEndcapP_xOffsetSouth" value="0.685/2.0*cm"/>
578+
<constant name="EcalEndcapP_yOffsetNorth" value="0.0*cm"/>
579+
<constant name="EcalEndcapP_yOffsetSouth" value="0.0*cm"/>
580+
<constant name="EcalEndcapP_nsGap" value="EcalEndcapP_xOffsetNorth+EcalEndcapP_xOffsetSouth"/>
581+
<constant name="EcalEndcapP_rmin" value="0.0*inch"/>
582+
<constant name="EcalEndcapP_rmax" value="81.0*inch"/>
583+
<constant name="EcalEndcapP_rmaxWithGap" value="EcalEndcapP_rmax + EcalEndcapP_nsGap/2.0"/>
584+
<constant name="EcalEndcapP_blockSize" value="10.0*cm"/>
585+
<constant name="EcalEndcapP_blockLength" value="17.0*cm"/>
586+
<constant name="EcalEndcapP_spaceBetweenBlock" value="0.1*cm"/>
587+
<constant name="EcalEndcapP_xOffsetBeamPipeNorth" value="3.0/4.0*EcalEndcapP_blockSize"/>
588+
<constant name="EcalEndcapP_xOffsetBeamPipeSouth" value="2.0*EcalEndcapP_blockSize + 2.0*EcalEndcapP_spaceBetweenBlock"/>
589+
<constant name="EcalEndcapP_insert_dy" value="3.0*EcalEndcapP_blockSize + 3.0*EcalEndcapP_spaceBetweenBlock"/>
590+
<constant name="EcalEndcapP_insert_dz" value="EcalEndcapP_length"/>
591+
<constant name="EcalEndcapP_insert_thickness" value="0.25*inch"/>
592+
<constant name="EcalEndcapP_insert_center_x" value="(EcalEndcapP_xOffsetBeamPipeNorth-EcalEndcapP_xOffsetBeamPipeSouth)/2.0"/>
593+
<constant name="EcalEndcapP_nfiber_x" value="26"/>
594+
<constant name="EcalEndcapP_nfiber_y" value="30"/>
595+
<constant name="EcalEndcapP_rfiber" value="0.0235*cm"/>
596+
<constant name="EcalEndcapP_rscfi" value="0.02209*cm"/>
583597

584598
<!-- <constant name="EcalEndcapN_zmin" value="BackwardPIDRegion_zmin + BackwardInnerEndcapRegion_length"/> -->
585599
<constant name="EcalEndcapN_zmin" value="175*cm"/> <!-- Currently fix value hardcoded -->
@@ -642,8 +656,11 @@ Service gaps in FW direction (before endcapP ECAL) and BW direction (before endc
642656
<constant name="HcalEndcapPInsert_zmax" value="HcalEndcapPInsert_zmin + HcalEndcapPInsert_length"/>
643657
<constant name="HcalEndcapPInsert_width" value="59.26*cm"/>
644658
<constant name="HcalEndcapPInsert_height" value="59.29*cm"/>
645-
<constant name="HcalEndcapPInsert_xposition" value="EcalEndcapPInsert_xposition"/>
646-
<constant name="HcalEndcapPInsert_yposition" value="EcalEndcapPInsert_yposition"/>
659+
<constant name="HcalEndcapPInsert_xposition" value="-10.0*cm"/>
660+
<constant name="HcalEndcapPInsert_yposition" value="0.0*cm"/>
661+
<constant name="HcalEndcapPInsert_hole_radius" value="14.61*cm"/>
662+
<constant name="HcalEndcapPInsert_hole_xposition" value="-7.20*cm"/>
663+
<constant name="HcalEndcapPInsert_hole_yposition" value="0.0*cm"/>
647664

648665
<constant name="HcalEndcapN_CaloSides" value="60"/>
649666
<constant name="HcalEndcapN_zmin" value="BackwardServiceGap_zmax + 44.0 * cm"/> <!-- 44 cm gap between service gap, includes 28.5 cm oculus -->

0 commit comments

Comments
 (0)