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

almost done

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-09-15 10:17:16 +02:00
parent 33807b7fac
commit 0f9a841c4a
5 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -156,8 +156,8 @@ int slsDetectorUtils::acquire(int delflag){
}
if (*threadedProcessing) {
sem_init(&dataThreadStartedSemaphore,1,0);
startThread(delflag);
}
#ifdef VERBOSE
@ -169,6 +169,8 @@ int slsDetectorUtils::acquire(int delflag){
resetFramesCaught();
}
if(*threadedProcessing && dataReady)
sem_wait(&dataThreadStartedSemaphore);
for(int im=0;im<nm;im++) {
#ifdef VERBOSE
@ -346,6 +348,7 @@ int slsDetectorUtils::acquire(int delflag){
pthread_mutex_lock(&mg);
stopReceiver();
pthread_mutex_unlock(&mg);
cout<<"receiver stopped"<<endl;
}
@ -468,6 +471,8 @@ int slsDetectorUtils::acquire(int delflag){
#ifdef VERBOSE
cout << "data processing thread joined" << endl;
#endif
if(dataReady)
sem_destroy(&dataThreadStartedSemaphore);
}