From 42a6068bfe1913e9932e12bba54169f6ce507d8e Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Tue, 19 Nov 2024 14:25:39 +0100 Subject: [PATCH 1/2] DPL: fix adjustment of spawnerInputs --- Framework/Core/src/ArrowSupport.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Framework/Core/src/ArrowSupport.cxx b/Framework/Core/src/ArrowSupport.cxx index e6f8fb90c7af9..78a2445d68920 100644 --- a/Framework/Core/src/ArrowSupport.cxx +++ b/Framework/Core/src/ArrowSupport.cxx @@ -472,10 +472,9 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec() } std::sort(ac.requestedDYNs.begin(), ac.requestedDYNs.end(), inputSpecLessThan); std::sort(ac.providedDYNs.begin(), ac.providedDYNs.end(), outputSpecLessThan); - std::vector spawnerInputs; for (auto& input : ac.requestedDYNs) { if (std::none_of(ac.providedDYNs.begin(), ac.providedDYNs.end(), [&input](auto const& x) { return DataSpecUtils::match(input, x); })) { - spawnerInputs.emplace_back(input); + ac.spawnerInputs.emplace_back(input); } } // recreate inputs and outputs @@ -483,8 +482,8 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec() spawner->inputs.clear(); // replace AlgorithmSpec // FIXME: it should be made more generic, so it does not need replacement... - spawner->algorithm = readers::AODReaderHelpers::aodSpawnerCallback(spawnerInputs); - AnalysisSupportHelpers::addMissingOutputsToSpawner({}, spawnerInputs, ac.requestedAODs, *spawner); + spawner->algorithm = readers::AODReaderHelpers::aodSpawnerCallback(ac.spawnerInputs); + AnalysisSupportHelpers::addMissingOutputsToSpawner({}, ac.spawnerInputs, ac.requestedAODs, *spawner); } if (writer != workflow.end()) { From 24c736b2442d4758ae1c66136e212151add1ef21 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:41:44 +0100 Subject: [PATCH 2/2] Update Framework/Core/src/ArrowSupport.cxx --- Framework/Core/src/ArrowSupport.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Framework/Core/src/ArrowSupport.cxx b/Framework/Core/src/ArrowSupport.cxx index 78a2445d68920..3f9014d8fbe3b 100644 --- a/Framework/Core/src/ArrowSupport.cxx +++ b/Framework/Core/src/ArrowSupport.cxx @@ -472,6 +472,7 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec() } std::sort(ac.requestedDYNs.begin(), ac.requestedDYNs.end(), inputSpecLessThan); std::sort(ac.providedDYNs.begin(), ac.providedDYNs.end(), outputSpecLessThan); + ac.spawnerInputs.clear(); for (auto& input : ac.requestedDYNs) { if (std::none_of(ac.providedDYNs.begin(), ac.providedDYNs.end(), [&input](auto const& x) { return DataSpecUtils::match(input, x); })) { ac.spawnerInputs.emplace_back(input);