From a89171464f6015ec8be3c0e296c03d6527fb796a Mon Sep 17 00:00:00 2001 From: Barthelemy Date: Fri, 7 Mar 2025 15:54:57 +0100 Subject: [PATCH 1/3] [QC-1258] Source repo URL should be used by triggers --- Framework/src/PostProcessingConfig.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Framework/src/PostProcessingConfig.cxx b/Framework/src/PostProcessingConfig.cxx index af431790db..b7d7fe3064 100644 --- a/Framework/src/PostProcessingConfig.cxx +++ b/Framework/src/PostProcessingConfig.cxx @@ -16,6 +16,8 @@ #include "QualityControl/PostProcessingConfig.h" +#include "QualityControl/runnerUtils.h" + #include namespace o2::quality_control::postprocessing @@ -27,7 +29,6 @@ PostProcessingConfig::PostProcessingConfig(const std::string& id, const boost::p moduleName(config.get("qc.postprocessing." + id + ".moduleName")), className(config.get("qc.postprocessing." + id + ".className")), detectorName(config.get("qc.postprocessing." + id + ".detectorName", "MISC")), - qcdbUrl(config.get("qc.config.database.implementation") == "CCDB" ? config.get("qc.config.database.host") : ""), ccdbUrl(config.get("qc.config.conditionDB.url", "")), consulUrl(config.get("qc.config.consul.url", "")), activity(config.get("qc.config.Activity.number", 0), @@ -40,6 +41,11 @@ PostProcessingConfig::PostProcessingConfig(const std::string& id, const boost::p matchAnyRunNumber(config.get("qc.config.postprocessing.matchAnyRunNumber", false)), critical(true) { + // 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 databasePath = sourceRepo? "qc.postprocessing." + id + ".sourceRepo" : "qc.config.database"; + qcdbUrl = config.get(databasePath + ".implementation") == "CCDB" ? config.get(databasePath + ".host") : ""; + for (const auto& initTrigger : config.get_child("qc.postprocessing." + id + ".initTrigger")) { initTriggers.push_back(initTrigger.second.get_value()); } From fd8a34e69f0007b23bf9e24c148db19cda5b8536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20von=20Haller?= Date: Fri, 7 Mar 2025 15:55:55 +0100 Subject: [PATCH 2/3] Update PostProcessingConfig.cxx --- Framework/src/PostProcessingConfig.cxx | 2 -- 1 file changed, 2 deletions(-) diff --git a/Framework/src/PostProcessingConfig.cxx b/Framework/src/PostProcessingConfig.cxx index b7d7fe3064..b8f5dae184 100644 --- a/Framework/src/PostProcessingConfig.cxx +++ b/Framework/src/PostProcessingConfig.cxx @@ -16,8 +16,6 @@ #include "QualityControl/PostProcessingConfig.h" -#include "QualityControl/runnerUtils.h" - #include namespace o2::quality_control::postprocessing From a494ffaea1d8d32fa8a0dfe9daa972d7617180de Mon Sep 17 00:00:00 2001 From: Barthelemy Date: Fri, 7 Mar 2025 16:18:05 +0100 Subject: [PATCH 3/3] format --- Framework/src/PostProcessingConfig.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Framework/src/PostProcessingConfig.cxx b/Framework/src/PostProcessingConfig.cxx index b8f5dae184..197507f11f 100644 --- a/Framework/src/PostProcessingConfig.cxx +++ b/Framework/src/PostProcessingConfig.cxx @@ -41,7 +41,7 @@ PostProcessingConfig::PostProcessingConfig(const std::string& id, const boost::p { // 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 databasePath = sourceRepo? "qc.postprocessing." + id + ".sourceRepo" : "qc.config.database"; + auto databasePath = sourceRepo ? "qc.postprocessing." + id + ".sourceRepo" : "qc.config.database"; qcdbUrl = config.get(databasePath + ".implementation") == "CCDB" ? config.get(databasePath + ".host") : ""; for (const auto& initTrigger : config.get_child("qc.postprocessing." + id + ".initTrigger")) {