Skip to content

Commit dcdc451

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 e6414fc commit dcdc451

File tree

2 files changed

+41
-8
lines changed

2 files changed

+41
-8
lines changed

.gitlab-ci.yml

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

DIS/eA/config.yml

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,54 @@
1-
DIS:eA:eAu:nevents:
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+
6+
DIS:eA:eAu:10x100:nevents:
7+
variables:
8+
<<: *eAu_10x100_variables
29
extends: .nevents
310
parallel:
411
matrix:
512
- DATA:
613
- "DIS/eA/BeAGLE1.03.02-1.0_DIS_eAu_10x100_q2_1to10.csv"
714
- "DIS/eA/BeAGLE1.03.02-1.0_DIS_eAu_10x100_q2_10to100.csv"
8-
- "DIS/eA/BeAGLE1.03.02-1.0_DIS_eAu_5x41_q2_1to10.csv"
9-
- "DIS/eA/BeAGLE1.03.02-1.0_DIS_eAu_5x41_q2_10to100.csv"
1015

11-
DIS:eA:eAu:timings:
16+
DIS:eA:eAu:10x100:timings:
17+
variables:
18+
<<: *eAu_10x100_variables
1219
extends: .timings
1320
needs:
14-
- DIS:eA:eAu:nevents
15-
variables:
16-
DETECTOR_CONFIG: "epic_craterlake_without_zdc"
21+
- DIS:eA:eAu:10x100:nevents
1722
parallel:
1823
matrix:
1924
- DATA:
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"
27+
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+
33+
DIS:eA:eAu:5x41:nevents:
34+
variables:
35+
<<: *eAu_5x41_variables
36+
extends: .nevents
37+
parallel:
38+
matrix:
39+
- DATA:
40+
- "DIS/eA/BeAGLE1.03.02-1.0_DIS_eAu_5x41_q2_1to10.csv"
41+
- "DIS/eA/BeAGLE1.03.02-1.0_DIS_eAu_5x41_q2_10to100.csv"
42+
43+
DIS:eA:eAu:5x41:timings:
44+
variables:
45+
<<: *eAu_5x41_variables
46+
extends: .timings
47+
needs:
48+
- DIS:eA:eAu:5x41:nevents
49+
parallel:
50+
matrix:
51+
- DATA:
2252
- "DIS/eA/BeAGLE1.03.02-1.0_DIS_eAu_5x41_q2_1to10.csv"
2353
- "DIS/eA/BeAGLE1.03.02-1.0_DIS_eAu_5x41_q2_10to100.csv"
2454

@@ -73,5 +103,6 @@ DIS:eA:other:timings:
73103
DIS:eA:collect:
74104
extends: .collect
75105
needs:
76-
- DIS:eA:eAu:timings
106+
- DIS:eA:eAu:10x100:timings
107+
- DIS:eA:eAu:5x41:timings
77108
- DIS:eA:other:timings

0 commit comments

Comments
 (0)