From 0e03fc6058c779e9869bb0484d9427206e981303 Mon Sep 17 00:00:00 2001
From: Eric Flumerfelt <eflumerf@fnal.gov>
Date: Wed, 18 Dec 2024 14:46:53 -0600
Subject: [PATCH] Change ModuleConfiguration to ConfigurationManager

---
 include/timinglibs/TimingController.hpp | 4 ++--
 src/TimingController.cpp                | 4 ++--
 src/TimingHardwareManagerBase.cpp       | 6 +++---
 src/TimingHardwareManagerBase.hpp       | 2 +-
 src/TimingMasterControllerBase.cpp      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/timinglibs/TimingController.hpp b/include/timinglibs/TimingController.hpp
index 8d508b9..275fe62 100644
--- a/include/timinglibs/TimingController.hpp
+++ b/include/timinglibs/TimingController.hpp
@@ -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>
@@ -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
diff --git a/src/TimingController.cpp b/src/TimingController.cpp
index 26355b9..565d1cd 100644
--- a/src/TimingController.cpp
+++ b/src/TimingController.cpp
@@ -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();
 }
 
diff --git a/src/TimingHardwareManagerBase.cpp b/src/TimingHardwareManagerBase.cpp
index 079ec50..52c5b9a 100644
--- a/src/TimingHardwareManagerBase.cpp
+++ b/src/TimingHardwareManagerBase.cpp
@@ -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>
@@ -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
diff --git a/src/TimingHardwareManagerBase.hpp b/src/TimingHardwareManagerBase.hpp
index 6a97b1b..9f7d925 100644
--- a/src/TimingHardwareManagerBase.hpp
+++ b/src/TimingHardwareManagerBase.hpp
@@ -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:
diff --git a/src/TimingMasterControllerBase.cpp b/src/TimingMasterControllerBase.cpp
index e1d88bb..6b49f81 100644
--- a/src/TimingMasterControllerBase.cpp
+++ b/src/TimingMasterControllerBase.cpp
@@ -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>