Skip to content

Commit ec478c6

Browse files
authored
[PWGHF,Tutorial] Fix parent level options and improve argument processing (#8988)
1 parent 271ebea commit ec478c6

File tree

3 files changed

+36
-23
lines changed

3 files changed

+36
-23
lines changed

Tutorials/PWGHF/dpl-config_task.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
"orbit-multiplier-enumeration": "0",
99
"start-value-enumeration": "0",
1010
"end-value-enumeration": "-1",
11-
"step-value-enumeration": "1",
12-
"aod-parent-access-level": "1",
13-
"aod-parent-base-path-replacement": "old-path-to-parent;new-path-to-parent"
11+
"step-value-enumeration": "1"
1412
},
1513
"internal-dpl-aod-spawner": "",
1614
"bc-converter": "",

Tutorials/PWGHF/run_skim.sh

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,23 @@ DIR_THIS="$(dirname "$(realpath "$0")")"
2828
JSON="$DIR_THIS/dpl-config_skim.json"
2929

3030
# command line options of O2 workflows
31-
OPTIONS="-b --configuration json://$JSON --aod-memory-rate-limit 2000000000 --shm-segment-size 16000000000 --resources-monitoring 2 --aod-writer-keep AOD/HFT2PRONG/0"
31+
OPTIONS=(
32+
-b
33+
--configuration json://"$JSON"
34+
--aod-memory-rate-limit 2000000000
35+
--shm-segment-size 16000000000
36+
--resources-monitoring 2
37+
--aod-writer-keep "AOD/HFT2PRONG/0"
38+
)
3239

3340
# execute the mini task workflow and its dependencies
3441
# shellcheck disable=SC2086 # Ignore unquoted options.
35-
o2-analysistutorial-hf-skim-creator-mini $OPTIONS | \
36-
o2-analysis-timestamp $OPTIONS | \
37-
o2-analysis-trackselection $OPTIONS | \
38-
o2-analysis-track-propagation $OPTIONS | \
39-
o2-analysis-bc-converter $OPTIONS | \
40-
o2-analysis-tracks-extra-converter $OPTIONS \
42+
o2-analysistutorial-hf-skim-creator-mini "${OPTIONS[@]}" | \
43+
o2-analysis-timestamp "${OPTIONS[@]}" | \
44+
o2-analysis-trackselection "${OPTIONS[@]}" | \
45+
o2-analysis-track-propagation "${OPTIONS[@]}" | \
46+
o2-analysis-bc-converter "${OPTIONS[@]}" | \
47+
o2-analysis-tracks-extra-converter "${OPTIONS[@]}" \
4148
> "$LOGFILE" 2>&1
4249

4350
# report status

Tutorials/PWGHF/run_task.sh

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,30 @@ DIR_THIS="$(dirname "$(realpath "$0")")"
2828
JSON="$DIR_THIS/dpl-config_task.json"
2929

3030
# command line options of O2 workflows
31-
OPTIONS="-b --configuration json://$JSON --aod-memory-rate-limit 2000000000 --shm-segment-size 16000000000 --resources-monitoring 2"
31+
OPTIONS=(
32+
-b
33+
--configuration json://"$JSON"
34+
--aod-memory-rate-limit 2000000000
35+
--shm-segment-size 16000000000
36+
--resources-monitoring 2
37+
--aod-parent-base-path-replacement "old-path-to-parent;new-path-to-parent"
38+
--aod-parent-access-level 1
39+
)
3240

3341
# execute the mini task workflow and its dependencies
3442
# shellcheck disable=SC2086 # Ignore unquoted options.
35-
o2-analysistutorial-hf-task-mini $OPTIONS | \
36-
o2-analysis-timestamp $OPTIONS | \
37-
o2-analysis-track-propagation $OPTIONS | \
38-
o2-analysis-event-selection $OPTIONS | \
39-
o2-analysis-pid-tpc-base $OPTIONS | \
40-
o2-analysis-pid-tpc $OPTIONS | \
41-
o2-analysis-pid-tof-base $OPTIONS | \
42-
o2-analysis-pid-tof-full $OPTIONS | \
43-
o2-analysis-ft0-corrected-table $OPTIONS | \
44-
o2-analysis-bc-converter $OPTIONS | \
45-
o2-analysis-tracks-extra-converter $OPTIONS | \
46-
o2-analysis-zdc-converter $OPTIONS \
43+
o2-analysistutorial-hf-task-mini "${OPTIONS[@]}" | \
44+
o2-analysis-timestamp "${OPTIONS[@]}" | \
45+
o2-analysis-track-propagation "${OPTIONS[@]}" | \
46+
o2-analysis-event-selection "${OPTIONS[@]}" | \
47+
o2-analysis-pid-tpc-base "${OPTIONS[@]}" | \
48+
o2-analysis-pid-tpc "${OPTIONS[@]}" | \
49+
o2-analysis-pid-tof-base "${OPTIONS[@]}" | \
50+
o2-analysis-pid-tof-full "${OPTIONS[@]}" | \
51+
o2-analysis-ft0-corrected-table "${OPTIONS[@]}" | \
52+
o2-analysis-bc-converter "${OPTIONS[@]}" | \
53+
o2-analysis-tracks-extra-converter "${OPTIONS[@]}" | \
54+
o2-analysis-zdc-converter "${OPTIONS[@]}" \
4755
> "$LOGFILE" 2>&1
4856

4957
# report status

0 commit comments

Comments
 (0)