Merge pull request #36 from DUNE-DAQ/eflumerf/MergeCfgMgrModCfg

Change ModuleConfiguration to ConfigurationManager

Author: jcfreeman2

include/datahandlinglibs/FakeCardReaderBase.hpp

@@ -24,7 +24,7 @@
 #include "appmodel/DataReaderModule.hpp"
 #include "appmodel/DataReaderConf.hpp"
 
-#include "appfwk/ModuleConfiguration.hpp"
+#include "appfwk/ConfigurationManager.hpp"
 
 #include "utilities/ReusableThread.hpp"
 #include "datahandlinglibs/utils/FileSourceBuffer.hpp"
@@ -58,7 +58,7 @@ class FakeCardReaderBase
   FakeCardReaderBase(FakeCardReaderBase&&) = delete;                 ///< FakeCardReaderBase is not move-constructible
   FakeCardReaderBase& operator=(FakeCardReaderBase&&) = delete;      ///< FakeCardReaderBase is not move-assignable
 
-  void init(std::shared_ptr<appfwk::ModuleConfiguration> cfg);
+  void init(std::shared_ptr<appfwk::ConfigurationManager> cfg);
 
   // To be implemented by final module
   virtual std::shared_ptr<datahandlinglibs::SourceEmulatorConcept>
@@ -76,7 +76,7 @@ class FakeCardReaderBase
   // Configuration
   bool m_configured;
   std::string m_name;
-  std::shared_ptr<appfwk::ModuleConfiguration> m_cfg;
+  std::shared_ptr<appfwk::ConfigurationManager> m_cfg;
 
   std::map<std::string, std::shared_ptr<datahandlinglibs::SourceEmulatorConcept>> m_source_emus;
 

include/datahandlinglibs/RawDataHandlerBase.hpp

@@ -20,7 +20,7 @@
 #include "nlohmann/json.hpp"
 #include "rcif/cmd/Nljs.hpp"
 
-#include "appfwk/ModuleConfiguration.hpp"
+#include "appfwk/ConfigurationManager.hpp"
 #include "appmodel/DataHandlerModule.hpp"
 
 #include <chrono>
@@ -46,7 +46,7 @@ class RawDataHandlerBase
   RawDataHandlerBase(RawDataHandlerBase&&) = delete;                 ///< RawDataHandlerBase is not move-constructible
   RawDataHandlerBase& operator=(RawDataHandlerBase&&) = delete;      ///< RawDataHandlerBase is not move-assignable
 
-  void init(std::shared_ptr<appfwk::ModuleConfiguration> cfg);
+  void init(std::shared_ptr<appfwk::ConfigurationManager> cfg);
   //  void get_info(opmonlib::InfoCollector& ci, int level);
 
   virtual std::shared_ptr<dunedaq::datahandlinglibs::DataHandlingConcept>

include/datahandlinglibs/detail/FakeCardReaderBase.hxx

@@ -9,12 +9,12 @@ FakeCardReaderBase::FakeCardReaderBase(const std::string& name)
 }
 
 void
-FakeCardReaderBase::init(std::shared_ptr<appfwk::ModuleConfiguration> cfg)
+FakeCardReaderBase::init(std::shared_ptr<appfwk::ConfigurationManager> cfg)
 {
   m_cfg = cfg;
   TLOG_DEBUG(dunedaq::datahandlinglibs::logging::TLVL_ENTER_EXIT_METHODS) << get_fcr_name() << ": Entering init() method";
   //auto ini = args.get<appfwk::app::ModInit>();
-  auto ini = cfg->module<appmodel::DataReaderModule>(m_name);
+  auto ini = cfg->get_dal<appmodel::DataReaderModule>(m_name);
   if (ini != nullptr && ini->get_configuration()->get_emulation_mode()) {
 
     for (auto qi : ini->get_outputs()) {
@@ -47,7 +47,7 @@ FakeCardReaderBase::do_conf(const nlohmann::json& /*args*/)
   if (m_configured) {
     TLOG_DEBUG(dunedaq::datahandlinglibs::logging::TLVL_WORK_STEPS) << "This module is already configured!";
   } else {
-      auto cfg = m_cfg->module<appmodel::DataReaderModule>(get_fcr_name());
+      auto cfg = m_cfg->get_dal<appmodel::DataReaderModule>(get_fcr_name());
 
     std::map<uint32_t, const confmodel::DetectorStream*> streams;
     for (const auto & det_connections : cfg->get_connections()) {

include/datahandlinglibs/detail/RawDataHandlerBase.hxx

@@ -18,11 +18,11 @@ RawDataHandlerBase::RawDataHandlerBase(const std::string& name)
 
 
 void
-RawDataHandlerBase::init(std::shared_ptr<appfwk::ModuleConfiguration> cfg)
+RawDataHandlerBase::init(std::shared_ptr<appfwk::ConfigurationManager> cfg)
 {
 
   TLOG_DEBUG(dunedaq::datahandlinglibs::logging::TLVL_ENTER_EXIT_METHODS) << get_dlh_name() << ": Entering init() method";
-  const appmodel::DataHandlerModule* modconf = cfg->module<appmodel::DataHandlerModule>(get_dlh_name());
+  const appmodel::DataHandlerModule* modconf = cfg->get_dal<appmodel::DataHandlerModule>(get_dlh_name());
   if(modconf == nullptr) {
     throw dunedaq::datahandlinglibs::FailedReadoutInitialization(ERS_HERE, get_dlh_name(), "not a DataHandlerModule");
   }