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

Merge branch '2.2-rc' into hdf5

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-12-16 15:00:22 +01:00
commit b5f7dc29af
1 changed files with 4 additions and 2 deletions
Show Stats 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!
if (*threadedProcessing) {
@ -480,6 +478,10 @@ int slsDetectorUtils::acquire(int delflag){
cout << "wait for data processing thread" << endl;
#endif
setJoinThread(1);
//let processing thread continue and checkjointhread
sem_post(&sem_newRTAcquisition);
pthread_join(dataProcessingThread, &status);
#ifdef VERBOSE
cout << "data processing thread joined" << endl;