DPL: allow plugins to know about discoveries of other plugins

ktf · ktf · commit 8f506c80c893 · 2024-11-07T20:03:46.000+01:00
diff --git a/Framework/Core/include/Framework/runDataProcessing.h b/Framework/Core/include/Framework/runDataProcessing.h
@@ -197,7 +197,6 @@ int mainNoCatch(int argc, char** argv)
   for (auto& extra : extraOptions) {
     workflowOptions.push_back(extra);
   }
-  workflowOptionsRegistry.loadExtra(extraOptions);
 
   ConfigContext configContext(workflowOptionsRegistry, argc, argv);
   o2::framework::WorkflowSpec specs = defineDataProcessing(configContext);
diff --git a/Framework/Core/src/ConfigParamDiscovery.cxx b/Framework/Core/src/ConfigParamDiscovery.cxx
@@ -75,6 +75,7 @@ std::vector<ConfigParamSpec> ConfigParamDiscovery::discover(ConfigParamRegistry&
     for (auto& extra : extras) {
       result.push_back(extra);
     }
+    registry.loadExtra(extras);
   }
   return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,6 @@ int mainNoCatch(int argc, char** argv)`
`197`	`197`	`for (auto& extra : extraOptions) {`
`198`	`198`	`workflowOptions.push_back(extra);`
`199`	`199`	`}`
`200`		`- workflowOptionsRegistry.loadExtra(extraOptions);`
`201`	`200`
`202`	`201`	`ConfigContext configContext(workflowOptionsRegistry, argc, argv);`
`203`	`202`	`o2::framework::WorkflowSpec specs = defineDataProcessing(configContext);`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ std::vector<ConfigParamSpec> ConfigParamDiscovery::discover(ConfigParamRegistry&`
`75`	`75`	`for (auto& extra : extras) {`
`76`	`76`	`result.push_back(extra);`
`77`	`77`	`}`
	`78`	`+ registry.loadExtra(extras);`
`78`	`79`	`}`
`79`	`80`	`return result;`
`80`	`81`	`}`