Skip to content
Snippets Groups Projects
Commit c198acce authored by Martin Killenberg's avatar Martin Killenberg
Browse files

triggerFanOut propagates data validity flag of the trigger

parent 76889ec1
No related branches found
No related tags found
No related merge requests found
...@@ -93,7 +93,7 @@ namespace ChimeraTK { ...@@ -93,7 +93,7 @@ namespace ChimeraTK {
while(true) { while(true) {
transferGroup.read(); transferGroup.read();
// send the version number to the consumers // send the version number to the consumers
boost::fusion::for_each(fanOutMap.table, SendDataToConsumers(version)); boost::fusion::for_each(fanOutMap.table, SendDataToConsumers(version, externalTrigger->dataValidity()));
// wait for external trigger // wait for external trigger
boost::this_thread::interruption_point(); boost::this_thread::interruption_point();
...@@ -109,7 +109,7 @@ namespace ChimeraTK { ...@@ -109,7 +109,7 @@ namespace ChimeraTK {
/** Functor class to send data to the consumers, suitable for /** Functor class to send data to the consumers, suitable for
* boost::fusion::for_each(). */ * boost::fusion::for_each(). */
struct SendDataToConsumers { struct SendDataToConsumers {
SendDataToConsumers(VersionNumber version, DataValidity triggerValidity = DataValidity::ok) SendDataToConsumers(VersionNumber version, DataValidity triggerValidity)
: _version(version), _triggerValidity(triggerValidity) {} : _version(version), _triggerValidity(triggerValidity) {}
template<typename PAIR> template<typename PAIR>
......
...@@ -502,8 +502,7 @@ BOOST_AUTO_TEST_CASE(testThreadedFanout) { ...@@ -502,8 +502,7 @@ BOOST_AUTO_TEST_CASE(testThreadedFanout) {
BOOST_AUTO_TEST_CASE(testInvalidTrigger) { BOOST_AUTO_TEST_CASE(testInvalidTrigger) {
std::cout << "testInvalidTrigger" << std::endl; std::cout << "testInvalidTrigger" << std::endl;
return; // FIXME Test does not pass because feature is not implemented yet.
// See issue #109
auto deviceRegister = device1DummyBackend->getRawAccessor("m1", "i3"); auto deviceRegister = device1DummyBackend->getRawAccessor("m1", "i3");
deviceRegister = 20; deviceRegister = 20;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment