Skip to content
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

Gcrone/private session #319

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Gcrone/private session #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions include/appfwk/ConfigurationManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#ifndef APPFWK_INCLUDE_CONFIGURATIONMANAGER_HPP_
#define APPFWK_INCLUDE_CONFIGURATIONMANAGER_HPP_

#include "appmodel/ConfigurationHelper.hpp"
#include "conffwk/Configuration.hpp"
#include "confmodel/ActionPlan.hpp"
#include "confmodel/DaqModule.hpp"
Expand Down Expand Up @@ -43,6 +44,7 @@ namespace appfwk {
class ConfigurationManager
{
std::shared_ptr<conffwk::Configuration> m_confdb;
std::shared_ptr<appmodel::ConfigurationHelper> m_helper;
std::string m_app_name;
std::string m_session_name;
std::string m_oks_config_spec;
Expand Down
3 changes: 2 additions & 1 deletion src/ConfigurationManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ ConfigurationManager::ConfigurationManager(std::string& config_spec, std::string
TLOG() << "Failed to get session";
throw MissingComponent(ERS_HERE, "Session " + session_name);
}
m_helper = std::make_shared<appmodel::ConfigurationHelper>(m_session);
}

void
Expand All @@ -59,7 +60,7 @@ ConfigurationManager::initialize()
if (smartDaqApp) {
auto cpos = m_oks_config_spec.find(":") + 1;
std::string oksFile = m_oks_config_spec.substr(cpos); // Strip off "oksconflibs:"
m_modules = smartDaqApp->generate_modules(m_confdb.get(), oksFile, m_session);
m_modules = smartDaqApp->generate_modules(m_confdb.get(), oksFile, m_helper);

for (auto& plan : smartDaqApp->get_action_plans()) {
auto cmd = plan->get_command()->get_cmd();
Expand Down
Loading