From 6f820d5bfc919ee52564587154f0da48454d9dda Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 5 Jul 2025 11:55:41 -0400 Subject: [PATCH 1/4] test: add epic_ip6_extended to check-overlap-tgeo This is a test for https://github.com/eic/epic/pull/903#issuecomment-3034675600 --- .github/workflows/linux-eic-shell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml index 97017d6a9..c70fd5163 100644 --- a/.github/workflows/linux-eic-shell.yml +++ b/.github/workflows/linux-eic-shell.yml @@ -293,7 +293,7 @@ jobs: strategy: matrix: option: ['m'] #, 's'] # FIXME - detector_config: [epic_craterlake] # FIXME + detector_config: [epic_craterlake, epic_ip6_extended] # FIXME fail-fast: false steps: - uses: actions/checkout@v4 From 4702bbb9fb1acf1251a4d6014f1f302e11774126 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 5 Jul 2025 14:24:00 -0400 Subject: [PATCH 2/4] add to check-overlap-geant4 now --- .github/workflows/linux-eic-shell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml index c70fd5163..5cadd7498 100644 --- a/.github/workflows/linux-eic-shell.yml +++ b/.github/workflows/linux-eic-shell.yml @@ -346,7 +346,7 @@ jobs: - build strategy: matrix: - detector_config: [epic_craterlake] + detector_config: [epic_craterlake, epic_ip6_extended] fail-fast: false steps: - uses: actions/checkout@v4 From 3cf96fa78e5931dc09fffcceeebc9338675451dd Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 6 Jul 2025 01:29:10 -0400 Subject: [PATCH 3/4] add tolerance of 0.01 matrix value to check-overlap-tgeo --- .github/workflows/linux-eic-shell.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml index 5cadd7498..f26f8f9a7 100644 --- a/.github/workflows/linux-eic-shell.yml +++ b/.github/workflows/linux-eic-shell.yml @@ -293,6 +293,7 @@ jobs: strategy: matrix: option: ['m'] #, 's'] # FIXME + tolerance_mm: [0.1, 0.01] detector_config: [epic_craterlake, epic_ip6_extended] # FIXME fail-fast: false steps: @@ -309,7 +310,7 @@ jobs: setup: install/bin/thisepic.sh run: | mkdir -p doc - checkOverlaps --option ${{ matrix.option }} -c ${DETECTOR_PATH}/${{ matrix.detector_config }}.xml | tee doc/overlap_check_tgeo.out + checkOverlaps --option ${{ matrix.option }} -t ${{ matrix.tolerance_mm }} -c ${DETECTOR_PATH}/${{ matrix.detector_config }}.xml | tee doc/overlap_check_tgeo.out noverlaps="$(grep -c ovlp doc/overlap_check_tgeo.out || true)" if [[ "${noverlaps}" -gt "0" ]] ; then echo "${noverlaps} overlaps found!" && false ; fi From a436f2fb814e9a203d968085dc310edb654ec1e8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 8 Jul 2025 12:04:29 -0400 Subject: [PATCH 4/4] add tolerance for geant4 check --- .github/workflows/linux-eic-shell.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml index f26f8f9a7..48b6d3b0c 100644 --- a/.github/workflows/linux-eic-shell.yml +++ b/.github/workflows/linux-eic-shell.yml @@ -348,6 +348,7 @@ jobs: strategy: matrix: detector_config: [epic_craterlake, epic_ip6_extended] + tolerance_mm: [0.1, 0.01] fail-fast: false steps: - uses: actions/checkout@v4 @@ -363,7 +364,7 @@ jobs: setup: install/bin/thisepic.sh run: | mkdir -p doc - python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/${{ matrix.detector_config }}.xml | tee doc/overlap_check_geant4.out + python scripts/checkOverlaps.py -t ${{ matrix.tolerance_mm }} -c ${DETECTOR_PATH}/${{ matrix.detector_config }}.xml | tee doc/overlap_check_geant4.out noverlaps="$(grep -c GeomVol1002 doc/overlap_check_geant4.out || true)" if [[ "${noverlaps}" -gt "0" ]] ; then echo "${noverlaps} overlaps found!" && false ; fi