detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-18 07:47:12 +02:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-07-02 13:50:20 +02:00
parent fc2cc7e00c
commit 975076043f
6 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -4185,15 +4185,16 @@ int multiSlsDetector::acquire() {
multi_shm()->stoppedFlag = 1;
}
// let processing thread listen to these packets
sem_post(&sem_newRTAcquisition);
if (multi_shm()->stoppedFlag == 0)
sem_post(&sem_newRTAcquisition);
}
if (multi_shm()->stoppedFlag == 0)
startAndReadAll();
// stop receiver
std::lock_guard<std::mutex> lock(mg);
if (receiver) {
std::lock_guard<std::mutex> lock(mg);
if (stopReceiver() == FAIL) {
multi_shm()->stoppedFlag = 1;
} else {
@ -4203,10 +4204,8 @@ int multiSlsDetector::acquire() {
// external process to be
// done sending data to gui
}
incrementFileIndex();
}
incrementFileIndex();
// waiting for the data processing thread to finish!
setJoinThreadFlag(true);