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

bug fix wasnt locked before setframeindex and unlocked after

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@556 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-05-16 07:36:55 +00:00
parent d4a4786670
commit 40c0772dda
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -240,19 +240,21 @@ void slsDetectorUtils::acquire(int delflag){
} }
setCurrentFrameIndex(0); setCurrentFrameIndex(0);
//if ((timerValue[FRAME_NUMBER]*timerValue[CYCLES_NUMBER])>1) {
if (multiframe>1){ if(receiver)
pthread_mutex_lock(&mg);
if (multiframe>1)
setFrameIndex(0); setFrameIndex(0);
} else { else
setFrameIndex(-1); setFrameIndex(-1);
}
if(receiver){ if(receiver){
//send receiver file name pthread_mutex_unlock(&mg);//unlock previous
pthread_mutex_lock(&mp); pthread_mutex_lock(&mp);
createFileName(); createFileName();
pthread_mutex_unlock(&mp); pthread_mutex_unlock(&mp);
//send receiver file name
pthread_mutex_lock(&mg); pthread_mutex_lock(&mg);
setFileName(fileIO::getFileName()); setFileName(fileIO::getFileName());
if(setReceiverOnline()==OFFLINE_FLAG){ if(setReceiverOnline()==OFFLINE_FLAG){