some fixes from 4.2.0 that might be important formoench

This commit is contained in:
2020-06-19 13:30:56 +02:00
parent 8747ca04f3
commit bce4a615fa
8 changed files with 27 additions and 12 deletions

View File

@ -64,9 +64,12 @@ int slsDetectorUtils::acquire(int delflag){
if(!receiver){
setDetectorIndex(-1);
}
pthread_mutex_lock(&mg);
int nc=setTimer(CYCLES_NUMBER,-1);
int nf=setTimer(FRAME_NUMBER,-1);
pthread_mutex_unlock(&mg);
if (nc==0) nc=1;
if (nf==0) nf=1;
int multiframe = nc*nf;