From b3f39eeb3437709803e69ec1310d1bc22fd19749 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Fri, 24 Apr 2026 15:44:45 +0200 Subject: [PATCH 1/2] put back AMD origin for the metadata message --- Framework/Core/include/Framework/AnalysisSupportHelpers.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Framework/Core/include/Framework/AnalysisSupportHelpers.h b/Framework/Core/include/Framework/AnalysisSupportHelpers.h index 803d8cf9d4685..1c1f2dcb86a1e 100644 --- a/Framework/Core/include/Framework/AnalysisSupportHelpers.h +++ b/Framework/Core/include/Framework/AnalysisSupportHelpers.h @@ -20,9 +20,7 @@ namespace o2::framework { -static constexpr std::array AODOrigins{header::DataOrigin{"AOD"}, header::DataOrigin{"AOD1"}, header::DataOrigin{"AOD2"}, header::DataOrigin{"EMB"}}; -// static constexpr std::array extendedAODOrigins{header::DataOrigin{"AOD"}, header::DataOrigin{"AOD1"}, header::DataOrigin{"AOD2"}, header::DataOrigin{"EMB"}}; -// static constexpr std::array writableAODOrigins{header::DataOrigin{"AOD"}, header::DataOrigin{"AOD1"}, header::DataOrigin{"AOD2"}, header::DataOrigin{"EMB"}}; +static constexpr std::array AODOrigins{header::DataOrigin{"AOD"}, header::DataOrigin{"AOD1"}, header::DataOrigin{"AOD2"}, header::DataOrigin{"EMB"}, header::DataOrigin{"AMD"}}; class DataOutputDirector; struct ConfigContext; From 74c64812ec1977ea431eea958a052b738269c44f Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Fri, 24 Apr 2026 23:22:32 +0200 Subject: [PATCH 2/2] isolate writable AOD origins --- Framework/AnalysisSupport/src/AODWriterHelpers.cxx | 2 +- Framework/Core/include/Framework/AnalysisSupportHelpers.h | 1 + Framework/Core/src/AnalysisSupportHelpers.cxx | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Framework/AnalysisSupport/src/AODWriterHelpers.cxx b/Framework/AnalysisSupport/src/AODWriterHelpers.cxx index 19cf7a1ebff7b..5b5829d96a1de 100644 --- a/Framework/AnalysisSupport/src/AODWriterHelpers.cxx +++ b/Framework/AnalysisSupport/src/AODWriterHelpers.cxx @@ -154,7 +154,7 @@ AlgorithmSpec AODWriterHelpers::getOutputTTreeWriter(ConfigContext const& ctx) } // skip non-AOD refs - if (!DataSpecUtils::partialMatch(*ref.spec, AODOrigins)) { + if (!DataSpecUtils::partialMatch(*ref.spec, writableAODOrigins)) { continue; } startTime = DataRefUtils::getHeader(ref)->startTime; diff --git a/Framework/Core/include/Framework/AnalysisSupportHelpers.h b/Framework/Core/include/Framework/AnalysisSupportHelpers.h index 1c1f2dcb86a1e..c1968123e765d 100644 --- a/Framework/Core/include/Framework/AnalysisSupportHelpers.h +++ b/Framework/Core/include/Framework/AnalysisSupportHelpers.h @@ -21,6 +21,7 @@ namespace o2::framework { static constexpr std::array AODOrigins{header::DataOrigin{"AOD"}, header::DataOrigin{"AOD1"}, header::DataOrigin{"AOD2"}, header::DataOrigin{"EMB"}, header::DataOrigin{"AMD"}}; +static constexpr std::array writableAODOrigins{header::DataOrigin{"AOD"}, header::DataOrigin{"AOD1"}, header::DataOrigin{"AOD2"}}; class DataOutputDirector; struct ConfigContext; diff --git a/Framework/Core/src/AnalysisSupportHelpers.cxx b/Framework/Core/src/AnalysisSupportHelpers.cxx index 4dab3b364e04d..35228bba531b0 100644 --- a/Framework/Core/src/AnalysisSupportHelpers.cxx +++ b/Framework/Core/src/AnalysisSupportHelpers.cxx @@ -102,7 +102,7 @@ std::shared_ptr AnalysisSupportHelpers::getDataOutputDirecto // use the dangling outputs std::vector danglingOutputs; for (auto ii = 0u; ii < OutputsInputs.size(); ii++) { - if (DataSpecUtils::partialMatch(OutputsInputs[ii], AODOrigins) && isDangling[ii]) { + if (DataSpecUtils::partialMatch(OutputsInputs[ii], writableAODOrigins) && isDangling[ii]) { danglingOutputs.emplace_back(OutputsInputs[ii]); } }