Skip to content

Revert "DPL Analysis: provide metadata to workflow construction" #11885

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 1 commit into from
Sep 11, 2023
Merged

Revert "DPL Analysis: provide metadata to workflow construction" #11885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Framework/AnalysisSupport/src/AODJAlienReaderHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@ AlgorithmSpec AODJAlienReaderHelpers::rootFileReaderCallback()
stats.updateStats({static_cast<short>(ProcessingStatsId::ARROW_MESSAGES_DESTROYED), DataProcessingStats::Op::Set, 0});
stats.updateStats({static_cast<short>(ProcessingStatsId::ARROW_BYTES_EXPIRED), DataProcessingStats::Op::Set, 0});

if (!options.isSet("aod-file-private")) {
if (!options.isSet("aod-file")) {
LOGP(fatal, "No input file defined!");
throw std::runtime_error("Processing is stopped!");
}

auto filename = options.get<std::string>("aod-file-private");
auto filename = options.get<std::string>("aod-file");

std::string parentFileReplacement;
if (options.isSet("aod-parent-base-path-replacement")) {
Expand Down
1 change: 0 additions & 1 deletion Framework/Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ o2_add_library(Framework
src/DefaultsHelpers.cxx
src/DomainInfoHeader.cxx
src/ProcessingPoliciesHelpers.cxx
src/ConfigParamDiscovery.cxx
src/ConfigParamStore.cxx
src/ConfigParamsHelper.cxx
src/ChannelParamSpec.cxx
Expand Down
34 changes: 0 additions & 34 deletions Framework/Core/include/Framework/ConfigParamDiscovery.h
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions Framework/Core/include/Framework/runDataProcessing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include "Framework/Logger.h"
#include "Framework/CheckTypes.h"
#include "Framework/StructToTuple.h"
#include "Framework/ConfigParamDiscovery.h"

#include <vector>
#include <cstring>
Expand Down Expand Up @@ -204,8 +203,6 @@ int mainNoCatch(int argc, char** argv)
workflowOptionsStore->preload();
workflowOptionsStore->activate();
ConfigParamRegistry workflowOptionsRegistry(std::move(workflowOptionsStore));
ConfigParamDiscovery::discover(workflowOptionsRegistry);

ConfigContext configContext(workflowOptionsRegistry, argc, argv);
o2::framework::WorkflowSpec specs = defineDataProcessing(configContext);
overrideCloning(configContext, specs);
Expand Down
71 changes: 0 additions & 71 deletions Framework/Core/src/ConfigParamDiscovery.cxx
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Framework/Core/src/WorkflowCustomizationHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ std::vector<ConfigParamSpec> WorkflowCustomizationHelpers::requiredWorkflowOptio
// options for AOD rate limiting
{"aod-memory-rate-limit", VariantType::Int64, 0LL, {"Rate limit AOD processing based on memory"}},

// options for the AOD reader
// aod-file needs to be available as workflow option, because we
// can configure the workflow based on the contents of the first file.
{"aod-file", VariantType::String, "", {"Input AOD file"}},
// options for AOD writer
{"aod-writer-json", VariantType::String, "", {"Name of the json configuration file"}},
{"aod-writer-resdir", VariantType::String, "", {"Name of the output directory"}},
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/src/WorkflowHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ void WorkflowHelpers::injectServiceDevices(WorkflowSpec& workflow, ConfigContext
static_cast<DataAllocator::SubSpecificationType>(compile_time_hash("internal-dpl-aod-reader")),
aodLifetime}},
.algorithm = AlgorithmSpec::dummyAlgorithm(),
.options = {ConfigParamSpec{"aod-file-private", VariantType::String, ctx.options().get<std::string>("aod-file"), {"AOD file"}},
.options = {ConfigParamSpec{"aod-file", VariantType::String, {"Input AOD file"}},
ConfigParamSpec{"aod-reader-json", VariantType::String, {"json configuration file"}},
ConfigParamSpec{"aod-parent-access-level", VariantType::String, {"Allow parent file access up to specified level. Default: no (0)"}},
ConfigParamSpec{"aod-parent-base-path-replacement", VariantType::String, {R"(Replace base path of parent files. Syntax: FROM;TO. E.g. "alien:///path/in/alien;/local/path". Enclose in "" on the command line.)"}},
Expand Down
13 changes: 3 additions & 10 deletions Framework/TestWorkflows/src/o2AnalysisWorkflow.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,7 @@ struct EtaAndClsHistograms {

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
// For the sake of running without an option, we do not throw an exception
// in case the option is not present.
if (cfgc.options().hasOption("aod-metadata-Run") == false ||
cfgc.options().get<std::string>("aod-metadata-Run") == "2") {
return WorkflowSpec{
adaptAnalysisTask<EtaAndClsHistograms>(cfgc),
};
} else {
throw std::runtime_error("Unsupported run type");
}
return WorkflowSpec{
adaptAnalysisTask<EtaAndClsHistograms>(cfgc),
};
}