Skip to content

DPL Analysis: fix metadata writing #15326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 2 commits into from
Apr 24, 2026
+4 −5
Merged

DPL Analysis: fix metadata writing #15326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3f39ee
put back AMD origin for the metadata message
aalkin Apr 24, 2026
74c6481
isolate writable AOD origins
aalkin Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Framework/AnalysisSupport/src/AODWriterHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<DataProcessingHeader*>(ref)->startTime;
Expand Down
5 changes: 2 additions & 3 deletions Framework/Core/include/Framework/AnalysisSupportHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@

namespace o2::framework
{
static constexpr std::array<header::DataOrigin, 4> AODOrigins{header::DataOrigin{"AOD"}, header::DataOrigin{"AOD1"}, header::DataOrigin{"AOD2"}, header::DataOrigin{"EMB"}};
// static constexpr std::array<header::DataOrigin, 6> extendedAODOrigins{header::DataOrigin{"AOD"}, header::DataOrigin{"AOD1"}, header::DataOrigin{"AOD2"}, header::DataOrigin{"EMB"}};
// static constexpr std::array<header::DataOrigin, 4> writableAODOrigins{header::DataOrigin{"AOD"}, header::DataOrigin{"AOD1"}, header::DataOrigin{"AOD2"}, header::DataOrigin{"EMB"}};
static constexpr std::array<header::DataOrigin, 5> AODOrigins{header::DataOrigin{"AOD"}, header::DataOrigin{"AOD1"}, header::DataOrigin{"AOD2"}, header::DataOrigin{"EMB"}, header::DataOrigin{"AMD"}};
static constexpr std::array<header::DataOrigin, 3> writableAODOrigins{header::DataOrigin{"AOD"}, header::DataOrigin{"AOD1"}, header::DataOrigin{"AOD2"}};

class DataOutputDirector;
struct ConfigContext;
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/src/AnalysisSupportHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ std::shared_ptr<DataOutputDirector> AnalysisSupportHelpers::getDataOutputDirecto
// use the dangling outputs
std::vector<InputSpec> 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]);
}
}
Expand Down