diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.3 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.3 index 2ad0e4c98..776d5225b 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.3 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.3 differ diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 31044feaf..58bc7a664 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -3462,11 +3462,11 @@ int slsDetector::updateDetectorNoWait() { n = controlSocket->ReceiveDataOnly( &retval,sizeof(int64_t)); thisDetector->timerValue[ACQUISITION_TIME]=retval; - if(thisDetector->myDetectorType!= EIGER){ + if(thisDetector->myDetectorType == EIGER){ //retval=setSubFrameExposureTime(tns); n = controlSocket->ReceiveDataOnly( &retval,sizeof(int64_t)); thisDetector->timerValue[SUBFRAME_ACQUISITION_TIME]=retval; -} + } //retval=setPeriod(tns); n = controlSocket->ReceiveDataOnly( &retval,sizeof(int64_t)); thisDetector->timerValue[FRAME_PERIOD]=retval; diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 025244f25..c75388663 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -2585,14 +2585,11 @@ int set_timer(int file_des) { strcpy(mess,"Sub Frame exposure time should not exceed 5.368 seconds\n"); break; } -#endif retval = setTimer(ind,tns); break; +#endif +#ifdef MYTHEN case PROBES_NUMBER: -#ifndef MYTHEND - ret=FAIL; - strcpy(mess,"Not applicable/implemented for this detector\n"); - break; #endif case FRAME_NUMBER: case ACQUISITION_TIME: