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

Change ModuleConfiguration to ConfigurationManager #137

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

Change ModuleConfiguration to ConfigurationManager #137

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
4 changes: 2 additions & 2 deletions include/timinglibs/TimingController.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "iomanager/Receiver.hpp"
#include "utilities/WorkerThread.hpp"

#include "appfwk/ModuleConfiguration.hpp"
#include "appfwk/ConfigurationManager.hpp"
#include "confmodel/Connection.hpp"

#include <memory>
Expand Down Expand Up @@ -92,7 +92,7 @@ class TimingController : public dunedaq::appfwk::DAQModule
TimingController(TimingController&&) = delete; ///< TimingController is not move-constructible
TimingController& operator=(TimingController&&) = delete; ///< TimingController is not move-assignable

void init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg) override;
void init(std::shared_ptr<appfwk::ConfigurationManager> mcfg) override;

protected:
// DAQModule commands
Expand Down
4 changes: 2 additions & 2 deletions src/TimingController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ TimingController::TimingController(const std::string& name, uint number_hw_comma
}

void
TimingController::init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg)
TimingController::init(std::shared_ptr<appfwk::ConfigurationManager> mcfg)
{
auto mod_config = mcfg->module<dal::TimingController>(get_name());
auto mod_config = mcfg->get_dal<dal::TimingController>(get_name());
m_params = mod_config->get_configuration();
}

Expand Down
6 changes: 3 additions & 3 deletions src/TimingHardwareManagerBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "timing/timingfirmware/Nljs.hpp"
#include "timing/timingfirmware/Structs.hpp"
#include "appfwk/ModuleConfiguration.hpp"
#include "appfwk/ConfigurationManager.hpp"

#include <memory>
#include <string>
Expand Down Expand Up @@ -57,9 +57,9 @@ TimingHardwareManagerBase::TimingHardwareManagerBase(const std::string& name)
}

void
TimingHardwareManagerBase::init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg)
TimingHardwareManagerBase::init(std::shared_ptr<appfwk::ConfigurationManager> mcfg)
{
auto mod_config = mcfg->module<timinglibs::dal::TimingHardwareManagerBase>(get_name());
auto mod_config = mcfg->get_dal<timinglibs::dal::TimingHardwareManagerBase>(get_name());
m_params = mod_config->get_configuration();

// set up queues
Expand Down
2 changes: 1 addition & 1 deletion src/TimingHardwareManagerBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class TimingHardwareManagerBase : public dunedaq::appfwk::DAQModule, public timi
TimingHardwareManagerBase& operator=(TimingHardwareManagerBase&&) = delete; ///< TimingHardwareManagerBase is not move-assignable
virtual ~TimingHardwareManagerBase() {}

void init(std::shared_ptr<appfwk::ModuleConfiguration> mcfg) override;
void init(std::shared_ptr<appfwk::ConfigurationManager> mcfg) override;
virtual void conf(const nlohmann::json& data);

protected:
Expand Down
2 changes: 1 addition & 1 deletion src/TimingMasterControllerBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "appfwk/cmd/Nljs.hpp"
#include "ers/Issue.hpp"
#include "appfwk/ModuleConfiguration.hpp"
#include "appfwk/ConfigurationManager.hpp"
#include "appfwk/DAQModule.hpp"

#include <chrono>
Expand Down
Loading