detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-30 01:40:04 +02:00
Code Issues Actions Packages Releases Activity

bugfix: cannot stop detector if rxr crashed

Browse Source
This commit is contained in:
maliakal_d 2020-10-01 17:54:08 +02:00
parent e5c98150e4
commit f31260030b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/src/Module.cpp
View File

@ -411,11 +411,17 @@ void Module::stopAcquisition() {
// get status before stopping acquisition // get status before stopping acquisition
runStatus s = ERROR, r = ERROR; runStatus s = ERROR, r = ERROR;
bool zmqstreaming = false; bool zmqstreaming = false;
try {
if (shm()->useReceiverFlag && getReceiverStreaming()) { if (shm()->useReceiverFlag && getReceiverStreaming()) {
zmqstreaming = true; zmqstreaming = true;
s = getRunStatus(); s = getRunStatus();
r = getReceiverStatus(); r = getReceiverStatus();
} }
} catch (...) {
// if receiver crashed, stop detector in any case
sendToDetectorStop(F_STOP_ACQUISITION);
return;
}
sendToDetectorStop(F_STOP_ACQUISITION); sendToDetectorStop(F_STOP_ACQUISITION);
shm()->stoppedFlag = true; shm()->stoppedFlag = true;
// if rxr streaming and acquisition finished, restream dummy stop packet // if rxr streaming and acquisition finished, restream dummy stop packet