Skip to content

Commit b785a77

Browse files
Sakib Rahmanclaude
andcommitted
Add override support to nevents jobs and use YAML anchors for shared variables
- Add DETECTOR_CONFIG_OVERRIDE and DETECTOR_VERSION_OVERRIDE support to .nevents template - Use YAML anchors to define variables once and reuse in both nevents and timings jobs - Ensures both job types write to and read from the same RESULTS_BASE path 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
1 parent bf29067 commit b785a77

File tree

3 files changed

+36
-14
lines changed

3 files changed

+36
-14
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ stages:
2626
.nevents:
2727
stage: nevents
2828
script:
29+
- export DETECTOR_CONFIG="${DETECTOR_CONFIG_OVERRIDE:-${DETECTOR_CONFIG}}"
30+
- export DETECTOR_VERSION="${DETECTOR_VERSION_OVERRIDE:-${DETECTOR_VERSION}}"
2931
- export RESULTS_BASE="results/${CONTAINER_NAME}/${IMAGE_TAG}/${DETECTOR_CONFIG}/${DETECTOR_VERSION}"
3032
- mkdir -p $(dirname ${RESULTS_BASE}/datasets/glob/$DATA)
3133
- grep -v "^\#" $DATA | parallel scripts/glob.sh ${RESULTS_BASE}/datasets/glob/$DATA {}

DIS/eA/config.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1+
.eAu_10x100_variables: &eAu_10x100_variables
2+
DETECTOR_CONFIG_OVERRIDE: "epic_craterlake_without_zdc"
3+
EBEAM_OVERRIDE: "10"
4+
PBEAM_OVERRIDE: "100_Au197"
5+
16
DIS:eA:eAu:10x100:nevents:
7+
variables:
8+
<<: *eAu_10x100_variables
29
extends: .nevents
310
parallel:
411
matrix:
@@ -8,9 +15,7 @@ DIS:eA:eAu:10x100:nevents:
815

916
DIS:eA:eAu:10x100:timings:
1017
variables:
11-
DETECTOR_CONFIG_OVERRIDE: "epic_craterlake_without_zdc"
12-
EBEAM_OVERRIDE: "10"
13-
PBEAM_OVERRIDE: "100_Au197"
18+
<<: *eAu_10x100_variables
1419
extends: .timings
1520
needs:
1621
- DIS:eA:eAu:10x100:nevents
@@ -20,7 +25,14 @@ DIS:eA:eAu:10x100:timings:
2025
- "DIS/eA/BeAGLE1.03.02-1.0_DIS_eAu_10x100_q2_1to10.csv"
2126
- "DIS/eA/BeAGLE1.03.02-1.0_DIS_eAu_10x100_q2_10to100.csv"
2227

28+
.eAu_5x41_variables: &eAu_5x41_variables
29+
DETECTOR_CONFIG_OVERRIDE: "epic_craterlake_without_zdc"
30+
EBEAM_OVERRIDE: "5"
31+
PBEAM_OVERRIDE: "41_Au197"
32+
2333
DIS:eA:eAu:5x41:nevents:
34+
variables:
35+
<<: *eAu_5x41_variables
2436
extends: .nevents
2537
parallel:
2638
matrix:
@@ -30,9 +42,7 @@ DIS:eA:eAu:5x41:nevents:
3042

3143
DIS:eA:eAu:5x41:timings:
3244
variables:
33-
DETECTOR_CONFIG_OVERRIDE: "epic_craterlake_without_zdc"
34-
EBEAM_OVERRIDE: "5"
35-
PBEAM_OVERRIDE: "41_Au197"
45+
<<: *eAu_5x41_variables
3646
extends: .timings
3747
needs:
3848
- DIS:eA:eAu:5x41:nevents

SIDIS/config.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1+
.eAu_10x100_variables: &eAu_10x100_variables
2+
NEVENTS_PER_TEST: 25
3+
DETECTOR_CONFIG_OVERRIDE: "epic_craterlake_without_zdc"
4+
EBEAM_OVERRIDE: "10"
5+
PBEAM_OVERRIDE: "100_Au197"
6+
17
SIDIS:eAu:10x100:nevents:
8+
variables:
9+
<<: *eAu_10x100_variables
210
extends: .nevents
311
parallel:
412
matrix:
@@ -8,10 +16,7 @@ SIDIS:eAu:10x100:nevents:
816

917
SIDIS:eAu:10x100:timings:
1018
variables:
11-
NEVENTS_PER_TEST: 25
12-
DETECTOR_CONFIG_OVERRIDE: "epic_craterlake_without_zdc"
13-
EBEAM_OVERRIDE: "10"
14-
PBEAM_OVERRIDE: "100_Au197"
19+
<<: *eAu_10x100_variables
1520
extends: .timings
1621
needs:
1722
- SIDIS:eAu:10x100:nevents
@@ -21,7 +26,15 @@ SIDIS:eAu:10x100:timings:
2126
- "SIDIS/eA/BeAGLE1.03.01-2.0_D0_eAu_10x100_q2_1to10000.csv"
2227
- "SIDIS/eA/BeAGLE1.03.01-2.0_Lc_eAu_10x100_q2_1to10000.csv"
2328

29+
.eAu_5x41_variables: &eAu_5x41_variables
30+
NEVENTS_PER_TEST: 25
31+
DETECTOR_CONFIG_OVERRIDE: "epic_craterlake_without_zdc"
32+
EBEAM_OVERRIDE: "5"
33+
PBEAM_OVERRIDE: "41_Au197"
34+
2435
SIDIS:eAu:5x41:nevents:
36+
variables:
37+
<<: *eAu_5x41_variables
2538
extends: .nevents
2639
parallel:
2740
matrix:
@@ -30,10 +43,7 @@ SIDIS:eAu:5x41:nevents:
3043

3144
SIDIS:eAu:5x41:timings:
3245
variables:
33-
NEVENTS_PER_TEST: 25
34-
DETECTOR_CONFIG_OVERRIDE: "epic_craterlake_without_zdc"
35-
EBEAM_OVERRIDE: "5"
36-
PBEAM_OVERRIDE: "41_Au197"
46+
<<: *eAu_5x41_variables
3747
extends: .timings
3848
needs:
3949
- SIDIS:eAu:5x41:nevents

0 commit comments

Comments
 (0)