Add option to enable DAQ.

CMakeLists.txt

@@ -40,6 +40,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 include(cmake/enable_code_coverage_report.cmake)
 include(cmake/set_control_system_adapter.cmake)
 find_package(ChimeraTK-ApplicationCore 03.00 REQUIRED)
+find_package(ChimeraTK-ApplicationCore-MicroDAQ 02.00)
 
 aux_source_directory(${CMAKE_SOURCE_DIR}/server server_sources)
 aux_source_directory(${CMAKE_SOURCE_DIR}/src library_sources)
@@ -52,7 +53,13 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 add_library(${EXE_NAME}_impl ${library_sources})
-target_link_libraries(${EXE_NAME}_impl ChimeraTK::ChimeraTK-ApplicationCore)
+
+IF(ChimeraTK-ApplicationCore-MicroDAQ_FOUND)
+  target_compile_options(${EXE_NAME}_impl PRIVATE "-DWITH_DAQ")
+  target_link_libraries(${EXE_NAME}_impl ChimeraTK::ChimeraTK-ApplicationCore ChimeraTK::ChimeraTK-ApplicationCore-MicroDAQ)
+ELSE()
+  target_link_libraries(${EXE_NAME}_impl ChimeraTK::ChimeraTK-ApplicationCore)  
+ENDIF(ChimeraTK-ApplicationCore-MicroDAQ_FOUND)
 
 # main server executable
 add_executable(${EXE_NAME} ${server_sources})

include/GenericApp.h

@@ -6,6 +6,9 @@
 #include <ChimeraTK/ApplicationCore/ApplicationCore.h>
 #include <ChimeraTK/ApplicationCore/PeriodicTrigger.h>
 #include <ChimeraTK/ApplicationCore/ScriptedInitialisationHandler.h>
+#ifdef WITH_DAQ
+#  include <ChimeraTK/ApplicationCore/MicroDAQ.h>
+#endif
 
 namespace ctk = ChimeraTK;
 
@@ -24,4 +27,9 @@ struct GenericApp : public ctk::Application {
   };
 
   std::vector<DeviceModuleGroup> deviceModules;
+
+#ifdef WITH_DAQ
+  ctk::MicroDAQ<uint64_t> daq;
+  void initialise() override;
+#endif
 };

sample_configs/generic_chimeratk_server_configuration.xml

@@ -7,6 +7,7 @@
     <variable name="triggerPath" type="string" value="/msTimer/tick" />
     <variable name="pathInDevice" type="string" value="/BSP" />
     <variable name="initScript" type="string" value="./writeWordStatus" />
+    <variable name="enableDAQ" type="boolean" value="true" />
  </module>
 
   <module name="TMCB2">
@@ -23,4 +24,14 @@
     <variable name="period" type="uint32" value="1000" />
   </module>
 
+  <module name="Configuration">
+    <module name="MicroDAQ">
+      <variable name="enable" type="boolean" value="true"/>
+      <variable name="outputFormat" type="string" value="hdf5"/>
+      <variable name="decimationFactor" type="uint32" value="10"/>
+      <variable name="decimationThreshold" type="uint32" value="200000"/>
+      <variable name="triggerPath" type="string" value="/msTimer/tick" />    
+    </module>
+  </module>
+
 </configuration>

src/GenericApp.cc

@@ -25,7 +25,30 @@ GenericApp::GenericApp() : Application("generic_chimeratk_server") {
     deviceModules.emplace_back(this, device, config.get<std::string>(device + "/triggerPath"),
         config.get<std::string>(device + "/pathInDevice"), config.get<std::string>(device + "/initScript"));
   }
+#ifdef WITH_DAQ
+  if(config.get<ctk::Boolean>("Configuration/MicroDAQ/enable", false)) {
+    daq = ctk::MicroDAQ<uint64_t>{this, "microDAQ", "DAQ module", "DAQ",
+        config.get<std::string>("Configuration/MicroDAQ/triggerPath"), {"MicroDAQ"}};
+  }
+#endif
+}
+#ifdef WITH_DAQ
+void GenericApp::initialise() {
+  if(config.get<ctk::Boolean>("Configuration/MicroDAQ/enable", false)) {
+    std::vector<std::string> devices = config.get<std::vector<std::string>>("devices");
+    for(const std::string& device : devices) {
+      if(config.get<ctk::Boolean>(device + "/enableDAQ", false)) {
+        auto it = std::find_if(deviceModules.begin(), deviceModules.end(),
+            [device](const DeviceModuleGroup& group) { return group.getName() == device; });
+        if(it != std::end(deviceModules)) {
+          daq.addDeviceModule(it->_deviceModule);
+        }
+      }
+    }
+  }
+  Application::initialise();
 }
+#endif
 
 GenericApp::~GenericApp() {
   shutdown();