From ba73ee1afa89fbd1eb91ce241b78807622369c96 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Fri, 15 May 2026 09:31:53 +0000 Subject: [PATCH] Please consider the following formatting changes --- .../src/AODJAlienReaderHelpers.cxx | 2 +- Framework/Core/include/Framework/ASoA.h | 15 +++++++----- .../Core/include/Framework/AnalysisHelpers.h | 23 ++++++++----------- .../Core/include/Framework/AnalysisManagers.h | 12 +++++----- .../Core/include/Framework/AnalysisTask.h | 11 ++++----- .../Core/src/AnalysisDataModelHelpers.cxx | 4 ++-- Framework/Core/src/AnalysisSupportHelpers.cxx | 4 ++-- Framework/Core/src/ArrowSupport.cxx | 4 ++-- 8 files changed, 37 insertions(+), 38 deletions(-) diff --git a/Framework/AnalysisSupport/src/AODJAlienReaderHelpers.cxx b/Framework/AnalysisSupport/src/AODJAlienReaderHelpers.cxx index d7613d3266ecb..7f7f4e048b440 100644 --- a/Framework/AnalysisSupport/src/AODJAlienReaderHelpers.cxx +++ b/Framework/AnalysisSupport/src/AODJAlienReaderHelpers.cxx @@ -240,7 +240,7 @@ AlgorithmSpec AODJAlienReaderHelpers::rootFileReaderCallback(ConfigContext const // create header auto concrete = DataSpecUtils::asConcreteDataMatcher(route.matcher); auto dh = header::DataHeader(concrete.description, concrete.origin, concrete.subSpec); - bool wasAOD = std::ranges::any_of(route.matcher.metadata, [](ConfigParamSpec const& p){ return p.name.starts_with("aod-origin-replaced"); }); + bool wasAOD = std::ranges::any_of(route.matcher.metadata, [](ConfigParamSpec const& p) { return p.name.starts_with("aod-origin-replaced"); }); if (!didir->readTree(outputs, dh, fcnt, ntf, totalSizeCompressed, totalSizeUncompressed, wasAOD)) { if (first) { diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h index d991d013de201..180945ad44061 100644 --- a/Framework/Core/include/Framework/ASoA.h +++ b/Framework/Core/include/Framework/ASoA.h @@ -1744,12 +1744,13 @@ auto doFilteredSliceBy(T const* table, o2::framework::PresliceBase auto doSliceByCached(T const* table, framework::expressions::BindingNode const& node, int value, o2::framework::SliceCache& cache) { - auto localCache = cache.ptr->getCacheFor({"", [&o = cache.ptr->newOrigin](framework::ConcreteDataMatcher&& m){ + auto localCache = cache.ptr->getCacheFor({"", [&o = cache.ptr->newOrigin](framework::ConcreteDataMatcher&& m) { if ((m.origin == header::DataOrigin{"AOD"}) && (o != header::DataOrigin{"AOD"})) { m.origin = o; } return m; - }(o2::soa::getMatcherFromTypeForKey(node.name)), node.name}); + }(o2::soa::getMatcherFromTypeForKey(node.name)), + node.name}); auto [offset, count] = localCache.getSliceFor(value); auto t = typename T::self_t({table->asArrowTable()->Slice(static_cast(offset), count)}, static_cast(offset)); if (t.tableSize() != 0) { @@ -1761,12 +1762,13 @@ auto doSliceByCached(T const* table, framework::expressions::BindingNode const& template auto doFilteredSliceByCached(T const* table, framework::expressions::BindingNode const& node, int value, o2::framework::SliceCache& cache) { - auto localCache = cache.ptr->getCacheFor({"", [&o = cache.ptr->newOrigin](framework::ConcreteDataMatcher&& m){ + auto localCache = cache.ptr->getCacheFor({"", [&o = cache.ptr->newOrigin](framework::ConcreteDataMatcher&& m) { if ((m.origin == header::DataOrigin{"AOD"}) && (o != header::DataOrigin{"AOD"})) { m.origin = o; } return m; - }(o2::soa::getMatcherFromTypeForKey(node.name)), node.name}); + }(o2::soa::getMatcherFromTypeForKey(node.name)), + node.name}); auto [offset, count] = localCache.getSliceFor(value); auto slice = table->asArrowTable()->Slice(static_cast(offset), count); return prepareFilteredSlice(table, slice, offset); @@ -1775,12 +1777,13 @@ auto doFilteredSliceByCached(T const* table, framework::expressions::BindingNode template auto doSliceByCachedUnsorted(T const* table, framework::expressions::BindingNode const& node, int value, o2::framework::SliceCache& cache) { - auto localCache = cache.ptr->getCacheUnsortedFor({"", [&o = cache.ptr->newOrigin](framework::ConcreteDataMatcher&& m){ + auto localCache = cache.ptr->getCacheUnsortedFor({"", [&o = cache.ptr->newOrigin](framework::ConcreteDataMatcher&& m) { if ((m.origin == header::DataOrigin{"AOD"}) && (o != header::DataOrigin{"AOD"})) { m.origin = o; } return m; - }(o2::soa::getMatcherFromTypeForKey(node.name)), node.name}); + }(o2::soa::getMatcherFromTypeForKey(node.name)), + node.name}); if constexpr (soa::is_filtered_table) { auto t = typename T::self_t({table->asArrowTable()}, localCache.getSliceFor(value)); if (t.tableSize() != 0) { diff --git a/Framework/Core/include/Framework/AnalysisHelpers.h b/Framework/Core/include/Framework/AnalysisHelpers.h index 342651cdbb29b..6066da7957b71 100644 --- a/Framework/Core/include/Framework/AnalysisHelpers.h +++ b/Framework/Core/include/Framework/AnalysisHelpers.h @@ -415,7 +415,7 @@ constexpr auto tableRef2InputSpec(header::DataOrigin newOrigin = header::DataOri sources = getInputMetadata>::metadata, o2::aod::Hash>(); } if ((R.origin_hash == "AOD"_h) && (newOrigin != header::DataOrigin{"AOD"})) { - std::ranges::transform(sources, sources.begin(), [originStr = newOrigin.as()](framework::ConfigParamSpec& source){ + std::ranges::transform(sources, sources.begin(), [originStr = newOrigin.as()](framework::ConfigParamSpec& source) { return replaceOrigin(source, originStr); }); metadata.push_back(framework::ConfigParamSpec{"aod-origin-replaced", framework::VariantType::Bool, true, {"\"\""}}); @@ -432,12 +432,12 @@ constexpr auto tableRef2InputSpec(header::DataOrigin newOrigin = header::DataOri } return framework::InputSpec{ - o2::aod::label(), - ((R.origin_hash == "AOD"_h) && (newOrigin != header::DataOrigin{"AOD"})) ? newOrigin : o2::aod::origin(), - o2::aod::description(o2::aod::signature()), - R.version, - framework::Lifetime::Timeframe, - metadata}; + o2::aod::label(), + ((R.origin_hash == "AOD"_h) && (newOrigin != header::DataOrigin{"AOD"})) ? newOrigin : o2::aod::origin(), + o2::aod::description(o2::aod::signature()), + R.version, + framework::Lifetime::Timeframe, + metadata}; } template @@ -632,11 +632,10 @@ struct TableTransform { std::vector requiredInputs = getRequiredInputs(); static std::vector getRequiredInputs(header::DataOrigin const& newOrigin = header::DataOrigin{"AOD"}) { - return [&newOrigin](std::index_sequence){ - return std::vector{soa::tableRef2InputSpec(newOrigin)...}; - }(std::make_index_sequence()); + return [&newOrigin](std::index_sequence) { + return std::vector{soa::tableRef2InputSpec(newOrigin)...}; + }(std::make_index_sequence()); } - }; /// This helper struct allows you to declare extended tables which should be @@ -654,7 +653,6 @@ constexpr auto transformBase() return TableTransform>::ref>{}; } - /// In a multi-origin case the origin is provided by the type /// FIXME: In a rewritten origin case the output designation needs to be changed (through base class) /// The extraction of the elements needs to be changed in AnalysisManagers using the origin information from the base class @@ -834,7 +832,6 @@ concept is_builds = requires(T t) { requires std::same_as>; }; - /// a task with rewritten origin, if running together with a task with the default, will /// have a different name and thus its output would be routed separately diff --git a/Framework/Core/include/Framework/AnalysisManagers.h b/Framework/Core/include/Framework/AnalysisManagers.h index 68c2a7c20eb1e..e896624d8b7a7 100644 --- a/Framework/Core/include/Framework/AnalysisManagers.h +++ b/Framework/Core/include/Framework/AnalysisManagers.h @@ -193,7 +193,7 @@ bool updateOutputSpec(T& entity, header::DataOrigin newOrigin = header::DataOrig template bool updateOutputSpec(T& producesGroup, header::DataOrigin newOrigin = header::DataOrigin{"AOD"}) { - homogeneous_apply_refs([&newOrigin](auto& produces){ return updateOutputSpec(produces, newOrigin); }, producesGroup); + homogeneous_apply_refs([&newOrigin](auto& produces) { return updateOutputSpec(produces, newOrigin); }, producesGroup); } template @@ -312,7 +312,7 @@ template bool prepareOutput(ProcessingContext& context, T& spawns) { using metadata = o2::aod::MetadataTrait>::metadata; - auto originalTable = soa::ArrowHelpers::joinTables( framework::extractTablesFromRecord(context.inputs(), spawns.requiredInputs | std::views::transform([](auto const& input){ return DataSpecUtils::asConcreteDataMatcher(input); }) ) ); + auto originalTable = soa::ArrowHelpers::joinTables(framework::extractTablesFromRecord(context.inputs(), spawns.requiredInputs | std::views::transform([](auto const& input) { return DataSpecUtils::asConcreteDataMatcher(input); }))); if (originalTable->num_rows() == 0) { originalTable = makeEmptyTable("EMPTY", typename metadata::base_table_t::persistent_columns_t{}); } @@ -330,7 +330,7 @@ bool prepareOutput(ProcessingContext& context, T& spawns) template bool prepareOutput(ProcessingContext& context, T& builds) { - return builds.build(framework::extractTablesFromRecord(context.inputs(), builds.requiredInputs | std::views::transform([](auto const& input){ return DataSpecUtils::asConcreteDataMatcher(input); }) )); + return builds.build(framework::extractTablesFromRecord(context.inputs(), builds.requiredInputs | std::views::transform([](auto const& input) { return DataSpecUtils::asConcreteDataMatcher(input); }))); } template @@ -338,7 +338,7 @@ bool prepareOutput(ProcessingContext& context, T& defines) requires(T::delayed == false) { using metadata = o2::aod::MetadataTrait>::metadata; - auto originalTable = soa::ArrowHelpers::joinTables( framework::extractTablesFromRecord(context.inputs(), defines.requiredInputs | std::views::transform([](auto const& input){ return DataSpecUtils::asConcreteDataMatcher(input); }) ) ); + auto originalTable = soa::ArrowHelpers::joinTables(framework::extractTablesFromRecord(context.inputs(), defines.requiredInputs | std::views::transform([](auto const& input) { return DataSpecUtils::asConcreteDataMatcher(input); }))); if (originalTable->num_rows() == 0) { originalTable = makeEmptyTable("EMPTY", typename metadata::base_table_t::persistent_columns_t{}); } @@ -370,7 +370,7 @@ bool prepareDelayedOutput(ProcessingContext& context, T& defines) defines.recompile(); } using metadata = o2::aod::MetadataTrait>::metadata; - auto originalTable = soa::ArrowHelpers::joinTables( framework::extractTablesFromRecord(context.inputs(), defines.requiredInputs | std::views::transform([](auto const& input){ return DataSpecUtils::asConcreteDataMatcher(input); }) ) ); + auto originalTable = soa::ArrowHelpers::joinTables(framework::extractTablesFromRecord(context.inputs(), defines.requiredInputs | std::views::transform([](auto const& input) { return DataSpecUtils::asConcreteDataMatcher(input); }))); if (originalTable->num_rows() == 0) { originalTable = makeEmptyTable(); } @@ -622,7 +622,7 @@ bool replaceOrigin(T& preslice, header::DataOrigin const& newOrigin = header::Da template bool replaceOrigin(T& presliceGroup, header::DataOrigin const& newOrigin) { - homogeneous_apply_refs([&newOrigin](auto& preslice){ return replaceOrigin(preslice, newOrigin); }, presliceGroup); + homogeneous_apply_refs([&newOrigin](auto& preslice) { return replaceOrigin(preslice, newOrigin); }, presliceGroup); return true; } diff --git a/Framework/Core/include/Framework/AnalysisTask.h b/Framework/Core/include/Framework/AnalysisTask.h index bdff4a3c0cc25..25f6187e9426e 100644 --- a/Framework/Core/include/Framework/AnalysisTask.h +++ b/Framework/Core/include/Framework/AnalysisTask.h @@ -276,8 +276,7 @@ struct AnalysisDataProcessorBuilder { template static auto extract(InputRecord& record, std::vector iInfos, std::vector& infos, size_t phash) { - auto matchers = std::ranges::find_if(iInfos, [&phash](auto const& info) { return info.hash == phash; })->matchers - | std::views::filter([](auto const& pair) { return pair.first == AI; }); + auto matchers = std::ranges::find_if(iInfos, [&phash](auto const& info) { return info.hash == phash; })->matchers | std::views::filter([](auto const& pair) { return pair.first == AI; }); if constexpr (soa::is_filtered) { return extractFilteredFromRecord(record, matchers, *std::ranges::find_if(infos, [&phash](ExpressionInfo const& i) { return (i.processHash == phash && i.argumentIndex == AI); })); } else { @@ -562,7 +561,7 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args) } // update OutputSpecs in output declarations - homogeneous_apply_refs_sized([&newOrigin](auto& element){ return analysis_task_parsers::updateOutputSpec(element, newOrigin); }, *task.get()); + homogeneous_apply_refs_sized([&newOrigin](auto& element) { return analysis_task_parsers::updateOutputSpec(element, newOrigin); }, *task.get()); // append outputs homogeneous_apply_refs_sized([&outputs, &hash](auto& element) { return analysis_task_parsers::appendOutput(outputs, element, hash); }, *task.get()); @@ -574,7 +573,7 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args) homogeneous_apply_refs_sized([&requiredServices](auto& element) { return analysis_task_parsers::addService(requiredServices, element); }, *task.get()); // replace origins in Preslice declarations - homogeneous_apply_refs_sized([&newOrigin](auto& element){ return analysis_task_parsers::replaceOrigin(element, newOrigin); }, *task.get()); + homogeneous_apply_refs_sized([&newOrigin](auto& element) { return analysis_task_parsers::replaceOrigin(element, newOrigin); }, *task.get()); auto algo = AlgorithmSpec::InitCallback{[task = task, expressionInfos, inputInfos, newOrigin, newOriginStr](InitContext& ic) mutable { Cache bindingsKeys; @@ -623,13 +622,13 @@ DataProcessorSpec adaptAnalysisTask(ConfigContext const& ctx, Args&&... args) *task.get()); /// replace origin in slicing caches - std::ranges::transform(bindingsKeys, bindingsKeys.begin(), [&newOrigin](Entry& entry){ + std::ranges::transform(bindingsKeys, bindingsKeys.begin(), [&newOrigin](Entry& entry) { if ((entry.matcher.origin == header::DataOrigin{"AOD"}) && (newOrigin != header::DataOrigin{"AOD"})) { entry.matcher = replaceOrigin(entry.matcher, newOrigin); } return entry; }); - std::ranges::transform(bindingsKeysUnsorted, bindingsKeysUnsorted.begin(), [&newOrigin](Entry& entry){ + std::ranges::transform(bindingsKeysUnsorted, bindingsKeysUnsorted.begin(), [&newOrigin](Entry& entry) { if ((entry.matcher.origin == header::DataOrigin{"AOD"}) && (newOrigin != header::DataOrigin{"AOD"})) { entry.matcher = replaceOrigin(entry.matcher, newOrigin); } diff --git a/Framework/Core/src/AnalysisDataModelHelpers.cxx b/Framework/Core/src/AnalysisDataModelHelpers.cxx index e3e9929e8f473..b683ce026dba4 100644 --- a/Framework/Core/src/AnalysisDataModelHelpers.cxx +++ b/Framework/Core/src/AnalysisDataModelHelpers.cxx @@ -36,8 +36,8 @@ std::string getTreeName(header::DataHeader dh, bool wasAOD) } // add prefix according to origin - if (wasAOD || std::ranges::any_of(framework::AODOrigins, [&o = dh.dataOrigin](header::DataOrigin const& origin){ return o == origin; })) { - treeName = "O2" + treeName; + if (wasAOD || std::ranges::any_of(framework::AODOrigins, [&o = dh.dataOrigin](header::DataOrigin const& origin) { return o == origin; })) { + treeName = "O2" + treeName; } // exceptions from this diff --git a/Framework/Core/src/AnalysisSupportHelpers.cxx b/Framework/Core/src/AnalysisSupportHelpers.cxx index d72bebdb3f63a..c99110353de21 100644 --- a/Framework/Core/src/AnalysisSupportHelpers.cxx +++ b/Framework/Core/src/AnalysisSupportHelpers.cxx @@ -174,8 +174,8 @@ void AnalysisSupportHelpers::addMissingOutputsToBuilder(std::vector c additionalInputs | sinks::update_input_list{publisher.inputs}; // update publisher inputs // FIXME: until we have a single list of pairs additionalInputs | - std::ranges::views::filter([](InputSpec const& input){ - return DataSpecUtils::partialMatch(input, AODOrigins) || std::ranges::any_of(input.metadata, [](ConfigParamSpec const& p){ + std::ranges::views::filter([](InputSpec const& input) { + return DataSpecUtils::partialMatch(input, AODOrigins) || std::ranges::any_of(input.metadata, [](ConfigParamSpec const& p) { return p.name.starts_with("aod-origin-replaced"); }); }) | diff --git a/Framework/Core/src/ArrowSupport.cxx b/Framework/Core/src/ArrowSupport.cxx index 8232dc43222c4..0a5b168f893b6 100644 --- a/Framework/Core/src/ArrowSupport.cxx +++ b/Framework/Core/src/ArrowSupport.cxx @@ -711,8 +711,8 @@ o2::framework::ServiceSpec ArrowSupport::arrowBackendSpec() // update currently requested AODs for (auto& d : workflow) { d.inputs | - std::ranges::views::filter([](InputSpec const& input){ - return DataSpecUtils::partialMatch(input, AODOrigins) || std::ranges::any_of(input.metadata, [](ConfigParamSpec const& p){ + std::ranges::views::filter([](InputSpec const& input) { + return DataSpecUtils::partialMatch(input, AODOrigins) || std::ranges::any_of(input.metadata, [](ConfigParamSpec const& p) { return p.name.starts_with("aod-origin-replaced"); }); }) |