[PWGHF,Tutorial] Fix parent level options and improve argument proces…

…sing (#8988)
AliceO2Group · Dec 13, 2024 · ec478c6 · ec478c6
1 parent 271ebea
commit ec478c6
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 23 deletions.
diff --git a/Tutorials/PWGHF/dpl-config_task.json b/Tutorials/PWGHF/dpl-config_task.json
@@ -8,9 +8,7 @@
         "orbit-multiplier-enumeration": "0",
         "start-value-enumeration": "0",
         "end-value-enumeration": "-1",
-        "step-value-enumeration": "1",
-        "aod-parent-access-level": "1",
-        "aod-parent-base-path-replacement": "old-path-to-parent;new-path-to-parent"
+        "step-value-enumeration": "1"
     },
     "internal-dpl-aod-spawner": "",
     "bc-converter": "",

diff --git a/Tutorials/PWGHF/run_skim.sh b/Tutorials/PWGHF/run_skim.sh
@@ -28,16 +28,23 @@ DIR_THIS="$(dirname "$(realpath "$0")")"
 JSON="$DIR_THIS/dpl-config_skim.json"
 
 # command line options of O2 workflows
-OPTIONS="-b --configuration json://$JSON --aod-memory-rate-limit 2000000000 --shm-segment-size 16000000000 --resources-monitoring 2 --aod-writer-keep AOD/HFT2PRONG/0"
+OPTIONS=(
+  -b
+  --configuration json://"$JSON"
+  --aod-memory-rate-limit 2000000000
+  --shm-segment-size 16000000000
+  --resources-monitoring 2
+  --aod-writer-keep "AOD/HFT2PRONG/0"
+)
 
 # execute the mini task workflow and its dependencies
 # shellcheck disable=SC2086 # Ignore unquoted options.
-o2-analysistutorial-hf-skim-creator-mini $OPTIONS | \
-o2-analysis-timestamp $OPTIONS | \
-o2-analysis-trackselection $OPTIONS | \
-o2-analysis-track-propagation $OPTIONS | \
-o2-analysis-bc-converter $OPTIONS | \
-o2-analysis-tracks-extra-converter $OPTIONS \
+o2-analysistutorial-hf-skim-creator-mini "${OPTIONS[@]}" | \
+o2-analysis-timestamp "${OPTIONS[@]}" | \
+o2-analysis-trackselection "${OPTIONS[@]}" | \
+o2-analysis-track-propagation "${OPTIONS[@]}" | \
+o2-analysis-bc-converter "${OPTIONS[@]}" | \
+o2-analysis-tracks-extra-converter "${OPTIONS[@]}" \
 > "$LOGFILE" 2>&1
 
 # report status

diff --git a/Tutorials/PWGHF/run_task.sh b/Tutorials/PWGHF/run_task.sh
@@ -28,22 +28,30 @@ DIR_THIS="$(dirname "$(realpath "$0")")"
 JSON="$DIR_THIS/dpl-config_task.json"
 
 # command line options of O2 workflows
-OPTIONS="-b --configuration json://$JSON --aod-memory-rate-limit 2000000000 --shm-segment-size 16000000000 --resources-monitoring 2"
+OPTIONS=(
+  -b
+  --configuration json://"$JSON"
+  --aod-memory-rate-limit 2000000000
+  --shm-segment-size 16000000000
+  --resources-monitoring 2
+  --aod-parent-base-path-replacement "old-path-to-parent;new-path-to-parent"
+  --aod-parent-access-level 1
+)
 
 # execute the mini task workflow and its dependencies
 # shellcheck disable=SC2086 # Ignore unquoted options.
-o2-analysistutorial-hf-task-mini $OPTIONS | \
-o2-analysis-timestamp $OPTIONS | \
-o2-analysis-track-propagation $OPTIONS | \
-o2-analysis-event-selection $OPTIONS | \
-o2-analysis-pid-tpc-base $OPTIONS | \
-o2-analysis-pid-tpc $OPTIONS | \
-o2-analysis-pid-tof-base $OPTIONS | \
-o2-analysis-pid-tof-full $OPTIONS | \
-o2-analysis-ft0-corrected-table $OPTIONS | \
-o2-analysis-bc-converter $OPTIONS | \
-o2-analysis-tracks-extra-converter $OPTIONS | \
-o2-analysis-zdc-converter $OPTIONS  \
+o2-analysistutorial-hf-task-mini "${OPTIONS[@]}" | \
+o2-analysis-timestamp "${OPTIONS[@]}" | \
+o2-analysis-track-propagation "${OPTIONS[@]}" | \
+o2-analysis-event-selection "${OPTIONS[@]}" | \
+o2-analysis-pid-tpc-base "${OPTIONS[@]}" | \
+o2-analysis-pid-tpc "${OPTIONS[@]}" | \
+o2-analysis-pid-tof-base "${OPTIONS[@]}" | \
+o2-analysis-pid-tof-full "${OPTIONS[@]}" | \
+o2-analysis-ft0-corrected-table "${OPTIONS[@]}" | \
+o2-analysis-bc-converter "${OPTIONS[@]}" | \
+o2-analysis-tracks-extra-converter "${OPTIONS[@]}" | \
+o2-analysis-zdc-converter "${OPTIONS[@]}" \
 > "$LOGFILE" 2>&1
 
 # report status