Skip to content

Cleanups in PostProcessingConfig #2542

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
Barthelemy merged 5 commits into from
May 5, 2025
Merged

Cleanups in PostProcessingConfig #2542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e8cfd4
consistently use ppTree in PostProcessingConfig when possible
knopers8 Apr 28, 2025
495b88e
remove unused "critical" field in PostProcessingConfig
knopers8 Apr 28, 2025
2c3728b
Merge branch 'master' into fixes-refactors-ppconfig
Barthelemy May 5, 2025
b865b2d
Merge branch 'master' into fixes-refactors-ppconfig
Barthelemy May 5, 2025
4f00333
fix bad merge
Barthelemy May 5, 2025
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
1 change: 0 additions & 1 deletion Framework/include/QualityControl/PostProcessingConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Collaborator Author

@knopers8 knopers8 May 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bad merge? i wouldn't expect the latter to disappear

Copy link
Collaborator

@Barthelemy Barthelemy May 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, bad merge

};

Expand Down
20 changes: 10 additions & 10 deletions Framework/src/PostProcessingConfig.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,20 @@ PostProcessingConfig::PostProcessingConfig(const std::string& id, const boost::p
config.get<std::string>("qc.config.Activity.provenance", "qc"),
{ config.get<uint64_t>("qc.config.Activity.start", 0),
config.get<uint64_t>("qc.config.Activity.end", -1) }),
matchAnyRunNumber(config.get<bool>("qc.config.postprocessing.matchAnyRunNumber", false)),
critical(true)
matchAnyRunNumber(config.get<bool>("qc.config.postprocessing.matchAnyRunNumber", false))
{
moduleName = config.get<std::string>("qc.postprocessing." + id + ".moduleName");
className = config.get<std::string>("qc.postprocessing." + id + ".className");
detectorName = config.get<std::string>("qc.postprocessing." + id + ".detectorName", "MISC");
auto ppTree = config.get_child("qc.postprocessing." + id);

moduleName = ppTree.get<std::string>("moduleName");
className = ppTree.get<std::string>("className");
detectorName = ppTree.get<std::string>("detectorName", "MISC");
ccdbUrl = config.get<std::string>("qc.config.conditionDB.url", "");
consulUrl = config.get<std::string>("qc.config.consul.url", "");
kafkaBrokersUrl = config.get<std::string>("qc.config.kafka.url", "");
kafkaTopicAliECSRun = config.get<std::string>("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<std::string>(databasePath + ".implementation") == "CCDB" ? config.get<std::string>(databasePath + ".host") : "";
// build the config of the qcdb
Expand All @@ -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<std::string>());
}
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<std::string>());
}
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<std::string>());
}
auto ppTree = config.get_child("qc.postprocessing." + id);
if (ppTree.count("extendedTaskParameters")) {
customParameters.populateCustomParameters(ppTree.get_child("extendedTaskParameters"));
} else if (ppTree.count("taskParameters") > 0) {
Expand Down