mx/Jungfraujoch
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 37 Wiki Activity

Merge branch '2403-det-stop-bug' into 'main'

Browse Source 
Cancel data acquisition not working when detector waits for TTL trigger

See merge request jungfraujoch/nextgendcu!33
This commit is contained in:
leonarski_f
2024-03-08 18:17:12 +01:00
parent 738cd26e6b add967483b
commit affb8d1380
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detector_control/DetectorWrapper.cpp
View File

@@ -139,7 +139,7 @@ void DetectorWrapper::InternalStop() {
auto state = GetState();
if (state == DetectorState::ERROR)
throw JFJochException(JFJochExceptionCategory::Detector, "Detector in error state");
else if (state == DetectorState::BUSY) {
else if ((state == DetectorState::BUSY) || (state == DetectorState::WAITING)) {
try {
det.stopDetector();
} catch (...) {