From b59de61f190f4058e9236a0a199d247e73ebbf6f Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Fri, 27 Oct 2023 12:13:53 +0200 Subject: [PATCH 1/3] Add track-extra-converter dependency. --- MC/analysis_testing/o2dpg_analysis_test_workflow.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MC/analysis_testing/o2dpg_analysis_test_workflow.py b/MC/analysis_testing/o2dpg_analysis_test_workflow.py index a3a3e37c8..c84898920 100755 --- a/MC/analysis_testing/o2dpg_analysis_test_workflow.py +++ b/MC/analysis_testing/o2dpg_analysis_test_workflow.py @@ -189,6 +189,7 @@ def get_additional_workflows(input_aod): found_O2collision_001 = False found_O2zdc_001 = False found_O2bc_001 = False + found_O2trackextra_001 = False for i in froot.GetListOfKeys(): if "DF_" not in i.GetName(): continue @@ -202,12 +203,16 @@ def get_additional_workflows(input_aod): found_O2zdc_001 = True if "O2bc_001" in j.GetName(): found_O2bc_001 = True + if "O2trackextra" in j.GetName(): + found_O2trackextra_001 = True if not found_O2collision_001: additional_workflows.append("o2-analysis-collision-converter --doNotSwap") if not found_O2zdc_001: additional_workflows.append("o2-analysis-zdc-converter") if not found_O2bc_001: additional_workflows.append("o2-analysis-bc-converter") + if found_O2trackextra_001: + additional_workflows.append("o2-analysis-tracks-extra-converter") break return additional_workflows From 175189bd7d9a7ee2f39cf3f93acb30f5d17fe4f9 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Fri, 27 Oct 2023 15:19:13 +0200 Subject: [PATCH 2/3] Fix table to be checked. --- MC/analysis_testing/o2dpg_analysis_test_workflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC/analysis_testing/o2dpg_analysis_test_workflow.py b/MC/analysis_testing/o2dpg_analysis_test_workflow.py index c84898920..74d755ce8 100755 --- a/MC/analysis_testing/o2dpg_analysis_test_workflow.py +++ b/MC/analysis_testing/o2dpg_analysis_test_workflow.py @@ -203,7 +203,7 @@ def get_additional_workflows(input_aod): found_O2zdc_001 = True if "O2bc_001" in j.GetName(): found_O2bc_001 = True - if "O2trackextra" in j.GetName(): + if "O2trackextra_001" in j.GetName(): found_O2trackextra_001 = True if not found_O2collision_001: additional_workflows.append("o2-analysis-collision-converter --doNotSwap") From 87e3a672fe4a3ef3214c387c99da6347a0dc8be9 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Fri, 27 Oct 2023 15:23:13 +0200 Subject: [PATCH 3/3] Fix bool checking. --- MC/analysis_testing/o2dpg_analysis_test_workflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC/analysis_testing/o2dpg_analysis_test_workflow.py b/MC/analysis_testing/o2dpg_analysis_test_workflow.py index 74d755ce8..703c8d446 100755 --- a/MC/analysis_testing/o2dpg_analysis_test_workflow.py +++ b/MC/analysis_testing/o2dpg_analysis_test_workflow.py @@ -211,7 +211,7 @@ def get_additional_workflows(input_aod): additional_workflows.append("o2-analysis-zdc-converter") if not found_O2bc_001: additional_workflows.append("o2-analysis-bc-converter") - if found_O2trackextra_001: + if not found_O2trackextra_001: additional_workflows.append("o2-analysis-tracks-extra-converter") break return additional_workflows