Merge pull request #121 from ChimeraTK/device_support_for_microDAQ

Device support for micro daq

Modules/include/MicroDAQ.h

@@ -66,6 +66,10 @@ namespace ChimeraTK {
     /** Add a Module as a source to this DAQ. */
     void addSource(const Module& source, const RegisterPath& namePrefix = "");
 
+    /**
+     * Overload that calls virtualiseFromCatalog.
+     */
+    void addSource(const DeviceModule& source, const RegisterPath& namePrefix = "");
    protected:
     void mainLoop() override;
 

Modules/src/MicroDAQ.cc

@@ -78,6 +78,14 @@ namespace ChimeraTK {
 
   /*********************************************************************************************************************/
 
+  template<typename TRIGGERTYPE>
+    void MicroDAQ<TRIGGERTYPE>::addSource(const DeviceModule& source, const RegisterPath& namePrefix) {
+    auto mod = source.virtualiseFromCatalog();
+    addSource(mod, namePrefix);
+  }
+
+  /*********************************************************************************************************************/
+
   template<typename TRIGGERTYPE>
   template<typename UserType>
   VariableNetworkNode MicroDAQ<TRIGGERTYPE>::getAccessor(const std::string& variableName) {

include/DeviceModule.h

@@ -267,7 +267,11 @@ namespace ChimeraTK {
     boost::shared_mutex recoverySharedMutex;
 
     friend class Application;
+    // Access to virtualiseFromCatalog() is needed by ServerHistory
     friend struct history::ServerHistory;
+    // Access to virtualiseFromCatalog() is needed by MicroDAQ
+    template<typename TRIGGERTYPE>
+    friend class MicroDAQ;
     friend struct detail::DeviceModuleProxy;
 
     template<typename T>