Skip to content

Commit f7a850d

Browse files
sawenzelclaude
andcommitted
Run each AnalysisQC analysis on its own in the workflow tests
This adds a split-mode AnalysisQC run to the workflow tests. - The tests ran the AnalysisQC only in merged mode, where one analysis can provide the tables of another. - The AO2D of the test workflow is now also processed with --split-analyses. - An analysis that misses a task it needs now fails the test. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent dbf6d9b commit f7a850d

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

‎test/run_workflow_tests.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ test_single_wf()
5959
local ret_this=${?}
6060
local ret_this_qc=0
6161
local ret_this_analysis=0
62+
local ret_this_analysis_split=0
6263
if [[ "${ret_this}" != "0" ]] ; then
6364
echo_red " -> FAILED"
6465
echo "[FATAL]: O2DPG_TEST Workflow creation failed" >> ${LOG_FILE_WF}
@@ -69,7 +70,10 @@ test_single_wf()
6970
# use -k|--keep-going feature to not stop after the first failure but see, if there are more
7071
[[ "${ret_this}" == "0" ]] && { ${O2DPG_ROOT}/MC/bin/o2_dpg_workflow_runner.py -f workflow.json --cpu-limit 8 --target-labels QC ${memlimit} -k >> ${LOG_FILE_WF} 2>&1 ; ret_this_qc=${?} ; }
7172
[[ "${ret_this}" == "0" ]] && { ${O2DPG_ROOT}/MC/bin/o2_dpg_workflow_runner.py -f workflow.json --cpu-limit 8 --target-labels Analysis ${memlimit} -k >> ${LOG_FILE_WF} 2>&1 ; ret_this_analysis=${?} ; }
72-
ret_this=$(first_nonzero "${ret_this}" "${ret_this_qc}" "${ret_this_analysis}")
73+
# each analysis on its own, to check that it brings all the tasks it needs
74+
[[ "${ret_this}" == "0" ]] && { ${O2DPG_ROOT}/MC/analysis_testing/o2dpg_analysis_test_workflow.py -f AO2D.root --is-mc --split-analyses -a AnalysisSplit -o workflow_analysis_split.json >> ${LOG_FILE_WF} 2>&1 && \
75+
${O2DPG_ROOT}/MC/bin/o2_dpg_workflow_runner.py -f workflow_analysis_split.json --cpu-limit 8 ${memlimit} -k >> ${LOG_FILE_WF} 2>&1 ; ret_this_analysis_split=${?} ; }
76+
ret_this=$(first_nonzero "${ret_this}" "${ret_this_qc}" "${ret_this_analysis}" "${ret_this_analysis_split}")
7377
[[ "${ret_this}" != "0" ]] && echo "[FATAL]: O2DPG_TEST Workflow execution failed" >> ${LOG_FILE_WF} || echo_green " -> PASSED"
7478
else
7579
echo_green " -> PASSED"

0 commit comments

Comments
 (0)