allow specifying the array length for direct connections between device and...

allow specifying the array length for direct connections between device and control system (as the type is already defined in this case)

include/ControlSystemModule.h

@@ -25,7 +25,8 @@ namespace ChimeraTK {
 
       /** The subscript operator returns a VariableNetworkNode which can be used in the Application::initialise()
        *  function to connect the control system variable with another variable. */
-      VariableNetworkNode operator()(const std::string& variableName, const std::type_info &valueType=typeid(AnyType));
+      VariableNetworkNode operator()(const std::string& variableName, const std::type_info &valueType=typeid(AnyType),
+                                     size_t nElements=0);
 
     protected:
 

include/DeviceModule.h

@@ -29,10 +29,10 @@ namespace ChimeraTK {
       /** The subscript operator returns a VariableNetworkNode which can be used in the Application::initialise()
        *  function to connect the register with another variable. */
       VariableNetworkNode operator()(const std::string& registerName, UpdateMode mode=UpdateMode::poll,
-          const std::type_info &valueType=typeid(AnyType));
+          const std::type_info &valueType=typeid(AnyType), size_t nElements=0);
       VariableNetworkNode operator()(const std::string& registerName, const std::type_info &valueType,
-          UpdateMode mode=UpdateMode::poll) {
-        return operator()(registerName, mode, valueType);
+          size_t nElements=0, UpdateMode mode=UpdateMode::poll) {
+        return operator()(registerName, mode, valueType, nElements);
       }
 
       /** Prepare the device for usage (i.e. open it) */

include/VariableNetworkNode.h

@@ -42,11 +42,11 @@ namespace ChimeraTK {
 
       /** Constructor for a Device node */
       VariableNetworkNode(const std::string &deviceAlias, const std::string &registerName, UpdateMode mode,
-          VariableDirection direction, const std::type_info &valTyp=typeid(AnyType));
+          VariableDirection direction, const std::type_info &valTyp=typeid(AnyType), size_t nElements=0);
 
       /** Constructor for a ControlSystem node */
       VariableNetworkNode(std::string publicName, VariableDirection direction,
-          const std::type_info &valTyp=typeid(AnyType));
+          const std::type_info &valTyp=typeid(AnyType), size_t nElements=0);
 
       /** Constructor for a TriggerReceiver node triggering the data transfer of another network. The additional dummy
        *  argument is only there to discriminate the signature from the copy constructor and will be ignored. */

src/ControlSystemModule.cc

@@ -17,8 +17,9 @@ namespace ChimeraTK {
 
   /*********************************************************************************************************************/
 
-  VariableNetworkNode ControlSystemModule::operator()(const std::string& variableName, const std::type_info &valueType) {
-    return{variableNamePrefix/variableName, VariableDirection::invalid, valueType};
+  VariableNetworkNode ControlSystemModule::operator()(const std::string& variableName, const std::type_info &valueType,
+                                                      size_t nElements) {
+    return{variableNamePrefix/variableName, VariableDirection::invalid, valueType, nElements};
   }
 
 }

src/DeviceModule.cc

@@ -20,8 +20,8 @@ namespace ChimeraTK {
   /*********************************************************************************************************************/
 
   VariableNetworkNode DeviceModule::operator()(const std::string& registerName, UpdateMode mode,
-      const std::type_info &valueType) {
-    return{deviceAliasOrURI, registerNamePrefix/registerName, mode, VariableDirection::invalid, valueType};
+      const std::type_info &valueType, size_t nElements) {
+    return{deviceAliasOrURI, registerNamePrefix/registerName, mode, VariableDirection::invalid, valueType, nElements};
   }
 
   /*********************************************************************************************************************/

src/VariableNetworkNode.cc

@@ -45,7 +45,7 @@ namespace ChimeraTK {
   /*********************************************************************************************************************/
 
   VariableNetworkNode::VariableNetworkNode(const std::string &devAlias, const std::string &regName, UpdateMode mod,
-      VariableDirection dir, const std::type_info &valTyp)
+      VariableDirection dir, const std::type_info &valTyp, size_t nElements)
   : pdata(new data)
   {
     pdata->type = NodeType::Device;
@@ -54,11 +54,13 @@ namespace ChimeraTK {
     pdata->valueType = &valTyp;
     pdata->deviceAlias = devAlias;
     pdata->registerName = regName;
+    pdata->nElements = nElements;
   }
 
   /*********************************************************************************************************************/
 
-  VariableNetworkNode::VariableNetworkNode(std::string pubName, VariableDirection dir, const std::type_info &valTyp)
+  VariableNetworkNode::VariableNetworkNode(std::string pubName, VariableDirection dir, const std::type_info &valTyp,
+      size_t nElements)
   : pdata(new data)
   {
     pdata->type = NodeType::ControlSystem;
@@ -66,6 +68,7 @@ namespace ChimeraTK {
     pdata->direction = dir;
     pdata->valueType = &valTyp;
     pdata->publicName = pubName;
+    pdata->nElements = nElements;
   }
 
   /*********************************************************************************************************************/
@@ -95,7 +98,7 @@ namespace ChimeraTK {
   /*********************************************************************************************************************/
 
   void VariableNetworkNode::dump() const {
-    if(pdata->type == NodeType::Application) std::cout << " type = Application";
+    if(pdata->type == NodeType::Application) std::cout << " type = Application ('" << pdata->appNode->getName() << "')";
     if(pdata->type == NodeType::ControlSystem) std::cout << " type = ControlSystem ('" << pdata->publicName << "')";
     if(pdata->type == NodeType::Device) std::cout << " type = Device (" << pdata->deviceAlias << ": " << pdata->registerName << ")";
     if(pdata->type == NodeType::TriggerReceiver) std::cout << " type = TriggerReceiver";
@@ -105,6 +108,7 @@ namespace ChimeraTK {
     if(pdata->mode == UpdateMode::poll) std::cout << " polling";
 
     std::cout << " data type: " << pdata->valueType->name();
+    std::cout << " length: " << pdata->nElements;
 
     std::cout << std::endl;
 }

tests/executables_src/testTrigger.cc

@@ -147,7 +147,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( testTriggerDevToCS, T, test_types ) {
 
   app.testModule.feedingToDevice >> dev("/MyModule/Variable");
 
-  dev("/MyModule/Variable", typeid(T)) [ app.testModule.theTrigger ] >> cs("myCSVar");
+  dev("/MyModule/Variable", typeid(T), 1) [ app.testModule.theTrigger ] >> cs("myCSVar");
+  
   app.run();
 
   BOOST_CHECK_EQUAL(pvManagers.first->getAllProcessVariables().size(), 1);
@@ -194,7 +195,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( testTriggerByCS, T, test_types ) {
 
   app.testModule.feedingToDevice >> dev("/MyModule/Variable");
 
-  dev("/MyModule/Variable", typeid(T)) [ cs("theTrigger", typeid(T)) ] >> cs("myCSVar");
+  dev("/MyModule/Variable", typeid(T), 1) [ cs("theTrigger", typeid(T), 1) ] >> cs("myCSVar");
   app.run();
 
   BOOST_CHECK_EQUAL(pvManagers.first->getAllProcessVariables().size(), 2);