Skip to content

Commit 005df11

Browse files
authored
Introduced new environment config variable (#1756)
* Introduced new environment config variable O2DPG_MC_CFG_ROOT is going to replace O2DPG_ROOT inside the config files. This will make the system more flexible by allowing the user to change this variable on-the-fly, and hence not be limited by the loaded version of O2DPG.
1 parent 8e68f09 commit 005df11

File tree

168 files changed

+430
-409
lines changed

Some content is hidden

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

168 files changed

+430
-409
lines changed

.github/workflows/syntax-checks.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,27 @@ jobs:
7171
jq -r '.comments[] | "Error found in \(.file) line \(.line):\n::error file=\(.file),line=\(.line),endLine=\(.endLine),col=\(.column),endColumn=\(.endColumn)::\(.message)"' errors.json
7272
exit "$error"
7373
74+
config-check:
75+
name: Config-check
76+
runs-on: ubuntu-latest
77+
78+
steps:
79+
- name: Checkout code
80+
uses: actions/checkout@v4
81+
82+
- name: Run .ini configs check
83+
run: |
84+
error=0
85+
readarray -d '' files < \
86+
<(find . -path ./.git -prune -false -or -type f -name '*.ini' -print0)
87+
for cfg in "${files[@]}"; do
88+
if grep -q "O2DPG_ROOT" "$cfg"; then
89+
error=1
90+
echo "Deprecated O2DPG_ROOT detected in $cfg, replace with O2DPG_MC_CONFIG_ROOT" >&2
91+
fi
92+
done
93+
exit "$error"
94+
7495
pylint:
7596
name: Pylint
7697
runs-on: ubuntu-latest

MC/config/ALICE3/ini/pythia8_ArAr.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
width[2]=6.0
33

44
[GeneratorExternal]
5-
fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
5+
fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
66
funcName=generator_pythia8_ALICE3()
77

88
[GeneratorPythia8]
9-
config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_ArAr.cfg
9+
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_ArAr.cfg

MC/config/ALICE3/ini/pythia8_KrKr.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
width[2]=6.0
33

44
[GeneratorExternal]
5-
fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
5+
fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
66
funcName=generator_pythia8_ALICE3()
77

88
[GeneratorPythia8]
9-
config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_KrKr.cfg
9+
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_KrKr.cfg

MC/config/ALICE3/ini/pythia8_OO.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
width[2]=6.0
33

44
[GeneratorExternal]
5-
fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
5+
fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
66
funcName=generator_pythia8_ALICE3()
77

88
[GeneratorPythia8]
9-
config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_OO.cfg
9+
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_OO.cfg

MC/config/ALICE3/ini/pythia8_PbPb.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
width[2]=6.0
33

44
[GeneratorExternal]
5-
fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
5+
fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
66
funcName=generator_pythia8_ALICE3()
77

88
[GeneratorPythia8]
9-
config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb.cfg
9+
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb.cfg

MC/config/ALICE3/ini/pythia8_PbPb_536tev.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
width[2]=6.0
33

44
[GeneratorExternal]
5-
fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
5+
fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
66
funcName=generator_pythia8_ALICE3()
77

88
[GeneratorPythia8]
9-
config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb_536tev.cfg
9+
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_PbPb_536tev.cfg

MC/config/ALICE3/ini/pythia8_XeXe.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
width[2]=6.0
33

44
[GeneratorExternal]
5-
fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
5+
fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
66
funcName=generator_pythia8_ALICE3()
77

88
[GeneratorPythia8]
9-
config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_XeXe.cfg
9+
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_XeXe.cfg

MC/config/ALICE3/ini/pythia8_pp.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
width[2]=6.0
33

44
[GeneratorExternal]
5-
fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
5+
fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
66
funcName=generator_pythia8_ALICE3()
77

88
[GeneratorPythia8]
9-
config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp.cfg
9+
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp.cfg

MC/config/ALICE3/ini/pythia8_pp_136tev.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
width[2]=6.0
33

44
[GeneratorExternal]
5-
fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
5+
fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
66
funcName=generator_pythia8_ALICE3()
77

88
[GeneratorPythia8]
9-
config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_136tev.cfg
9+
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_136tev.cfg

MC/config/ALICE3/ini/pythia8_pp_13tev.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
width[2]=6.0
33

44
[GeneratorExternal]
5-
fileName=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
5+
fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator_pythia8_ALICE3.C
66
funcName=generator_pythia8_ALICE3()
77

88
[GeneratorPythia8]
9-
config=${O2DPG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_13tev.cfg
9+
config=${O2DPG_MC_CONFIG_ROOT}/MC/config/ALICE3/pythia8/generator/pythia8_pp_13tev.cfg

0 commit comments

Comments
 (0)