Skip to content
Snippets Groups Projects
Commit e6c01e14 authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

do not propagate DataValidity::faulty flag if device is not yet open

parent 49d4e84d
No related branches found
No related tags found
No related merge requests found
......@@ -95,11 +95,6 @@ namespace ChimeraTK {
retry:
try {
if(!_deviceModule.device.isOpened()) {
if(lastValidity == DataValidity::ok) {
lastValidity = DataValidity::faulty;
version = externalTrigger->getVersionNumber();
boost::fusion::for_each(fanOutMap.table, SendDataToConsumers(version, DataValidity::faulty));
}
Application::getInstance().testableModeUnlock("waitForDeviceOpen");
boost::this_thread::sleep(boost::posix_time::millisec(DeviceOpenTimeout));
Application::getInstance().testableModeLock("waitForDeviceOpen");
......@@ -118,7 +113,7 @@ namespace ChimeraTK {
}
// send the version number to the consumers
boost::fusion::for_each(fanOutMap.table, SendDataToConsumers(version));
// wait for external trigger
// wait for external trigger (exception handling is done here by the decorator)
boost::this_thread::interruption_point();
Profiler::stopMeasurement();
externalTrigger->read();
......
......@@ -58,7 +58,6 @@ namespace ChimeraTK {
deviceModule.writeAfterOpen.push_back(this->_recoveryAccessor);
return false;
}
setOwnerValidityFunction(DataValidity::faulty);
Application::getInstance().testableModeUnlock("waitForDeviceOpen");
boost::this_thread::sleep(boost::posix_time::millisec(DeviceOpenTimeout));
Application::getInstance().testableModeLock("waitForDeviceOpen");
......
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