From cbd5e52f32c695c204a3242999aad29d6d7783c8 Mon Sep 17 00:00:00 2001 From: simonge Date: Mon, 16 Sep 2024 18:05:59 +0100 Subject: [PATCH 1/4] Correct xml file being called for different beam settings --- .github/workflows/linux-eic-shell.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml index e4f4bf09b..6b2e0fd7e 100644 --- a/.github/workflows/linux-eic-shell.yml +++ b/.github/workflows/linux-eic-shell.yml @@ -401,7 +401,7 @@ jobs: detector_config: craterlake_tracking_only - beam: 18x275 minq2: 1000 - detector_config: craterlake + detector_config: craterlake_18x275 steps: - uses: cvmfs-contrib/github-action-cvmfs@v4 - name: Retrieve simulation files @@ -449,7 +449,7 @@ jobs: setup: "/opt/detector/epic-${{ env.detector-version }}/bin/thisepic.sh" run: | url=root://dtn-eic.jlab.org//work/eic2/EPIC/EVGEN/SIDIS/pythia6-eic/1.0.0/${{matrix.beam}}/q2_0to1/pythia_ep_noradcor_${{matrix.beam}}_q2_0.000000001_1.0_run1.ab.hepmc3.tree.root - npsim --compactFile ${DETECTOR_PATH}/${DETECTOR}_${{ matrix.detector_config }}.xml -N 100 --inputFiles ${url} --random.seed 1 --outputFile sim_dis_${{matrix.beam}}_minQ2=0_${{ matrix.detector_config }}.edm4hep.root -v WARNING + npsim --compactFile ${DETECTOR_PATH}/${DETECTOR}_${{ matrix.detector_config }}_${{matrix.beam}}.xml -N 100 --inputFiles ${url} --random.seed 1 --outputFile sim_dis_${{matrix.beam}}_minQ2=0_${{ matrix.detector_config }}.edm4hep.root -v WARNING - uses: actions/upload-artifact@v4 with: name: sim_dis_${{matrix.beam}}_minQ2=0_${{ matrix.detector_config }}.edm4hep.root From 55e9e2d59a15b5144725f29924b29bd4ebf7338b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 16 Sep 2024 14:30:24 -0400 Subject: [PATCH 2/4] how about this --- .github/workflows/linux-eic-shell.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml index 6b2e0fd7e..3a960616d 100644 --- a/.github/workflows/linux-eic-shell.yml +++ b/.github/workflows/linux-eic-shell.yml @@ -431,8 +431,12 @@ jobs: - detector-info strategy: matrix: - beam: [5x41, 10x100, 18x275] - detector_config: [craterlake] + - beam: 5x41 + detector_config: craterlake + - beam: 10x100 + detector_config: craterlake + - beam: 18x275 + detector_config: craterlake_18x275 steps: - uses: cvmfs-contrib/github-action-cvmfs@v4 - name: Retrieve simulation files @@ -449,7 +453,7 @@ jobs: setup: "/opt/detector/epic-${{ env.detector-version }}/bin/thisepic.sh" run: | url=root://dtn-eic.jlab.org//work/eic2/EPIC/EVGEN/SIDIS/pythia6-eic/1.0.0/${{matrix.beam}}/q2_0to1/pythia_ep_noradcor_${{matrix.beam}}_q2_0.000000001_1.0_run1.ab.hepmc3.tree.root - npsim --compactFile ${DETECTOR_PATH}/${DETECTOR}_${{ matrix.detector_config }}_${{matrix.beam}}.xml -N 100 --inputFiles ${url} --random.seed 1 --outputFile sim_dis_${{matrix.beam}}_minQ2=0_${{ matrix.detector_config }}.edm4hep.root -v WARNING + npsim --compactFile ${DETECTOR_PATH}/${DETECTOR}_${{ matrix.detector_config }}.xml -N 100 --inputFiles ${url} --random.seed 1 --outputFile sim_dis_${{matrix.beam}}_minQ2=0_${{ matrix.detector_config }}.edm4hep.root -v WARNING - uses: actions/upload-artifact@v4 with: name: sim_dis_${{matrix.beam}}_minQ2=0_${{ matrix.detector_config }}.edm4hep.root @@ -871,7 +875,7 @@ jobs: - CC: clang beam: 18x275 minq2: 1000 - detector_config: craterlake + detector_config: craterlake_18x275 steps: - name: mmap rnd_bits workaround # https://github.com/actions/runner/issues/3207#issuecomment-2000066889 From 8f80c0814c933d6bf4489893958460895d2e581c Mon Sep 17 00:00:00 2001 From: simonge Date: Mon, 16 Sep 2024 20:51:34 +0100 Subject: [PATCH 3/4] Update remaining configs --- .github/workflows/linux-eic-shell.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml index 3a960616d..bbbf24b06 100644 --- a/.github/workflows/linux-eic-shell.yml +++ b/.github/workflows/linux-eic-shell.yml @@ -432,7 +432,7 @@ jobs: strategy: matrix: - beam: 5x41 - detector_config: craterlake + detector_config: craterlake_5x41 - beam: 10x100 detector_config: craterlake - beam: 18x275 @@ -859,15 +859,19 @@ jobs: - npsim-minbias strategy: matrix: - CC: [clang] - beam: [10x100, 18x275] - minq2: [0] - detector_config: [craterlake] include: - CC: clang beam: 5x41 minq2: 0 + detector_config: craterlake_5x41 + - CC: clang + beam: 10x100 + minq2: 0 detector_config: craterlake + - CC: clang + beam: 18x275 + minq2: 0 + detector_config: craterlake_18x275 - CC: clang beam: 10x100 minq2: 1000 From 8c41cab0763c100802178f54e63bf36118a019e3 Mon Sep 17 00:00:00 2001 From: simonge Date: Mon, 16 Sep 2024 22:19:23 +0100 Subject: [PATCH 4/4] Add include block --- .github/workflows/linux-eic-shell.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml index bbbf24b06..b61f2dcd2 100644 --- a/.github/workflows/linux-eic-shell.yml +++ b/.github/workflows/linux-eic-shell.yml @@ -431,12 +431,13 @@ jobs: - detector-info strategy: matrix: - - beam: 5x41 - detector_config: craterlake_5x41 - - beam: 10x100 - detector_config: craterlake - - beam: 18x275 - detector_config: craterlake_18x275 + include: + - beam: 5x41 + detector_config: craterlake_5x41 + - beam: 10x100 + detector_config: craterlake + - beam: 18x275 + detector_config: craterlake_18x275 steps: - uses: cvmfs-contrib/github-action-cvmfs@v4 - name: Retrieve simulation files