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

ktf · web-flow · commit daa577651394 · 2023-09-11T21:09:09.000+02:00
This reverts commit eb66275.
diff --git a/Framework/AnalysisSupport/src/AODJAlienReaderHelpers.cxx b/Framework/AnalysisSupport/src/AODJAlienReaderHelpers.cxx
@@ -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")) {
diff --git a/Framework/Core/CMakeLists.txt b/Framework/Core/CMakeLists.txt
@@ -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
diff --git a/Framework/Core/include/Framework/ConfigParamDiscovery.h b/Framework/Core/include/Framework/ConfigParamDiscovery.h
diff --git a/Framework/Core/include/Framework/runDataProcessing.h b/Framework/Core/include/Framework/runDataProcessing.h
@@ -30,7 +30,6 @@
 #include "Framework/Logger.h"
 #include "Framework/CheckTypes.h"
 #include "Framework/StructToTuple.h"
-#include "Framework/ConfigParamDiscovery.h"
 
 #include <vector>
 #include <cstring>
@@ -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);
diff --git a/Framework/Core/src/ConfigParamDiscovery.cxx b/Framework/Core/src/ConfigParamDiscovery.cxx
diff --git a/Framework/Core/src/WorkflowCustomizationHelpers.cxx b/Framework/Core/src/WorkflowCustomizationHelpers.cxx
@@ -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"}},
diff --git a/Framework/Core/src/WorkflowHelpers.cxx b/Framework/Core/src/WorkflowHelpers.cxx
@@ -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.)"}},
diff --git a/Framework/TestWorkflows/src/o2AnalysisWorkflow.cxx b/Framework/TestWorkflows/src/o2AnalysisWorkflow.cxx
@@ -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),
+  };
 }
