diff --git a/Framework/include/QualityControl/PostProcessingConfig.h b/Framework/include/QualityControl/PostProcessingConfig.h index 11c487fba1..8261496478 100644 --- a/Framework/include/QualityControl/PostProcessingConfig.h +++ b/Framework/include/QualityControl/PostProcessingConfig.h @@ -42,7 +42,6 @@ struct PostProcessingConfig : public o2::quality_control::core::UserCodeConfig { std::string kafkaTopicAliECSRun; core::Activity activity; bool matchAnyRunNumber = false; - bool critical; bool validityFromLastTriggerOnly = false; }; diff --git a/Framework/src/PostProcessingConfig.cxx b/Framework/src/PostProcessingConfig.cxx index 594a9ad227..f1b8abdaf4 100644 --- a/Framework/src/PostProcessingConfig.cxx +++ b/Framework/src/PostProcessingConfig.cxx @@ -31,19 +31,20 @@ PostProcessingConfig::PostProcessingConfig(const std::string& id, const boost::p config.get("qc.config.Activity.provenance", "qc"), { config.get("qc.config.Activity.start", 0), config.get("qc.config.Activity.end", -1) }), - matchAnyRunNumber(config.get("qc.config.postprocessing.matchAnyRunNumber", false)), - critical(true) + matchAnyRunNumber(config.get("qc.config.postprocessing.matchAnyRunNumber", false)) { - moduleName = config.get("qc.postprocessing." + id + ".moduleName"); - className = config.get("qc.postprocessing." + id + ".className"); - detectorName = config.get("qc.postprocessing." + id + ".detectorName", "MISC"); + auto ppTree = config.get_child("qc.postprocessing." + id); + + moduleName = ppTree.get("moduleName"); + className = ppTree.get("className"); + detectorName = ppTree.get("detectorName", "MISC"); ccdbUrl = config.get("qc.config.conditionDB.url", ""); consulUrl = config.get("qc.config.consul.url", ""); kafkaBrokersUrl = config.get("qc.config.kafka.url", ""); kafkaTopicAliECSRun = config.get("qc.config.kafka.topicAliecsRun", "aliecs.run"); // if available, use the source repo as defined in the postprocessing task, otherwise the general QCDB - auto sourceRepo = config.get_child_optional("qc.postprocessing." + id + ".sourceRepo"); + auto sourceRepo = ppTree.get_child_optional("sourceRepo"); auto databasePath = sourceRepo ? "qc.postprocessing." + id + ".sourceRepo" : "qc.config.database"; auto qcdbUrl = config.get(databasePath + ".implementation") == "CCDB" ? config.get(databasePath + ".host") : ""; // build the config of the qcdb @@ -53,16 +54,15 @@ PostProcessingConfig::PostProcessingConfig(const std::string& id, const boost::p }; repository = dbConfig; - for (const auto& initTrigger : config.get_child("qc.postprocessing." + id + ".initTrigger")) { + for (const auto& initTrigger : ppTree.get_child("initTrigger")) { initTriggers.push_back(initTrigger.second.get_value()); } - for (const auto& updateTrigger : config.get_child("qc.postprocessing." + id + ".updateTrigger")) { + for (const auto& updateTrigger : ppTree.get_child("updateTrigger")) { updateTriggers.push_back(updateTrigger.second.get_value()); } - for (const auto& stopTrigger : config.get_child("qc.postprocessing." + id + ".stopTrigger")) { + for (const auto& stopTrigger : ppTree.get_child("stopTrigger")) { stopTriggers.push_back(stopTrigger.second.get_value()); } - auto ppTree = config.get_child("qc.postprocessing." + id); if (ppTree.count("extendedTaskParameters")) { customParameters.populateCustomParameters(ppTree.get_child("extendedTaskParameters")); } else if (ppTree.count("taskParameters") > 0) {