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

eiger reading master slave top bottom configuration from firmware;not reading from file anymore, serial is hardcoded for each master: also bug changes in gui getting frame from receiver in postprocessing

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-02-23 15:13:14 +01:00
parent b2c7944014
commit d658799b20
16 changed files with 394 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -342,14 +342,26 @@ void slsDetectorUtils::acquire(int delflag){
}
pthread_mutex_unlock(&mg);
}else{
pthread_mutex_lock(&mg);
startReceiverReadout();
acquiringDone = 1;
pthread_mutex_unlock(&mg);
// wait until data processing thread has taken the last frame
if (*threadedProcessing) {
sem_wait(&sem_queue);
pthread_mutex_lock(&mg);
acquiringDone = 0;
pthread_mutex_unlock(&mg);
}
pthread_mutex_lock(&mg);
/* startReceiverReadout();
while(getReceiverStatus() != RUN_FINISHED){
pthread_mutex_unlock(&mg);
usleep(50000);
pthread_mutex_lock(&mg);
}
*/
stopReceiver();
pthread_mutex_unlock(&mg);
}