detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-16 14:57:13 +02:00
Code Issues Actions Packages Releases Activity

bug in sem for new scans

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-12-16 14:59:55 +01:00
parent 64843c1c76
commit 2d1c91c0e0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -471,8 +471,6 @@ int slsDetectorUtils::acquire(int delflag){
} }
//let processing thread continue and checkjointhread
sem_post(&sem_newRTAcquisition);
// waiting for the data processing thread to finish! // waiting for the data processing thread to finish!
if (*threadedProcessing) { if (*threadedProcessing) {
@ -480,6 +478,10 @@ int slsDetectorUtils::acquire(int delflag){
cout << "wait for data processing thread" << endl; cout << "wait for data processing thread" << endl;
#endif #endif
setJoinThread(1); setJoinThread(1);
//let processing thread continue and checkjointhread
sem_post(&sem_newRTAcquisition);
pthread_join(dataProcessingThread, &status); pthread_join(dataProcessingThread, &status);
#ifdef VERBOSE #ifdef VERBOSE
cout << "data processing thread joined" << endl; cout << "data processing thread joined" << endl;