Merge pull request #134 from DUNE-DAQ/johnfreeman/daq-release_issue37…

…9_renames

JCF: account for new datahandlinglibs package as described in DUNE-DA…

CMakeLists.txt

@@ -8,7 +8,7 @@ daq_setup_environment()
 find_package(ers REQUIRED)
 find_package(appfwk REQUIRED)
 find_package(logging REQUIRED)
-find_package(readoutlibs REQUIRED)
+find_package(datahandlinglibs REQUIRED)
 find_package(fdreadoutlibs REQUIRED)
 find_package(felix REQUIRED)
 find_package(opmonlib REQUIRED)
@@ -19,7 +19,7 @@ daq_codegen( *info.jsonnet DEP_PKGS opmonlib TEMPLATES opmonlib/InfoStructs.hpp.
 
 ##############################################################################
 # Dependency sets
-set(DUNEDAQ_DEPENDENCIES appfwk::appfwk readoutlibs::readoutlibs fdreadoutlibs::fdreadoutlibs appmodel::appmodel confmodel::confmodel)
+set(DUNEDAQ_DEPENDENCIES appfwk::appfwk datahandlinglibs::datahandlinglibs fdreadoutlibs::fdreadoutlibs appmodel::appmodel confmodel::confmodel)
 
 # Provide override functionality for FELIX dependencies
 option(WITH_FELIX_AS_PACKAGE "FELIX externals as a dunedaq package" ON)

cmake/flxlibsConfig.cmake.in

@@ -6,7 +6,7 @@ include(CMakeFindDependencyMacro)
 find_dependency(ers)
 find_dependency(appfwk)
 find_dependency(logging)
-find_dependency(readoutlibs)
+find_dependency(datahandlinglibs)
 find_dependency(fdreadoutlibs)
 find_dependency(felix)
 find_dependency(opmonlib)

src/CardWrapper.hpp

@@ -12,7 +12,7 @@
 //#include "flxlibs/felixcardreader/Structs.hpp"
 
 #include "appmodel/FelixInterface.hpp"
-#include "readoutlibs/utils/ReusableThread.hpp"
+#include "datahandlinglibs/utils/ReusableThread.hpp"
 
 #include "flxcard/FlxCard.h"
 #include "packetformat/block_format.hpp"
@@ -107,7 +107,7 @@ class CardWrapper
   // Processor
   inline static const std::string m_dma_processor_name = "flx-dma";
   std::atomic<bool> m_run_lock;
-  readoutlibs::ReusableThread m_dma_processor;
+  datahandlinglibs::ReusableThread m_dma_processor;
   std::function<void(uint64_t)> m_handle_block_addr; // NOLINT
   bool m_block_addr_handler_available{ false };
   void process_DMA();

src/CreateElink.hpp

@@ -11,7 +11,7 @@
 #include "ElinkConcept.hpp"
 #include "ElinkModel.hpp"
 #include "flxlibs/AvailableParserOperations.hpp"
-#include "readoutlibs/ReadoutIssues.hpp"
+#include "datahandlinglibs/DataHandlingIssues.hpp"
 //#include "fdreadoutlibs/ProtoWIBSuperChunkTypeAdapter.hpp"
 //#include "fdreadoutlibs/DUNEWIBSuperChunkTypeAdapter.hpp"
 #include "fdreadoutlibs/DAPHNESuperChunkTypeAdapter.hpp"
@@ -35,7 +35,7 @@ createElinkModel(const std::string& conn_uid)
 {
   auto datatypes = dunedaq::iomanager::IOManager::get()->get_datatypes(conn_uid);
   if (datatypes.size() != 1) {
-    ers::error(dunedaq::readoutlibs::GenericConfigurationError(ERS_HERE,
+    ers::error(dunedaq::datahandlinglibs::GenericConfigurationError(ERS_HERE,
       "Multiple output data types specified! Expected only a single type!"));
   }
   std::string raw_dt{ *datatypes.begin() };

src/ElinkModel.hpp

@@ -17,7 +17,7 @@
 #include "iomanager/Sender.hpp"
 #include "flxlibs/felixcardreaderinfo/InfoNljs.hpp"
 #include "logging/Logging.hpp"
-#include "readoutlibs/utils/ReusableThread.hpp"
+#include "datahandlinglibs/utils/ReusableThread.hpp"
 
 #include <folly/ProducerConsumerQueue.h>
 #include <nlohmann/json.hpp>
@@ -187,7 +187,7 @@ class ElinkModel : public ElinkConcept
 
   // Processor
   inline static const std::string m_parser_thread_name = "elinkp";
-  readoutlibs::ReusableThread m_parser_thread;
+  datahandlinglibs::ReusableThread m_parser_thread;
   void process_elink()
   {
     while (m_run_marker.load()) {

test/apps/test_tp_elinkhandler_app.cxx

@@ -12,7 +12,7 @@
 #include "flxlibs/AvailableParserOperations.hpp"
 
 #include "logging/Logging.hpp"
-#include "readoutlibs/ReadoutTypes.hpp"
+#include "datahandlinglibs/ReadoutTypes.hpp"
 #include "detdataformats/wib/RawWIBTp.hpp"
 
 #include "packetformat/block_format.hpp"