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

fixed the update on detector udpating acq period with subexptime

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-07-15 15:45:40 +02:00
parent 4939e47305
commit bdf725be48
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.3
View File

Binary file not shown.

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3462,7 +3462,7 @@ int slsDetector::updateDetectorNoWait() {
n = controlSocket->ReceiveDataOnly( &retval,sizeof(int64_t)); n = controlSocket->ReceiveDataOnly( &retval,sizeof(int64_t));
thisDetector->timerValue[ACQUISITION_TIME]=retval; thisDetector->timerValue[ACQUISITION_TIME]=retval;
if(thisDetector->myDetectorType!= EIGER){ if(thisDetector->myDetectorType == EIGER){
//retval=setSubFrameExposureTime(tns); //retval=setSubFrameExposureTime(tns);
n = controlSocket->ReceiveDataOnly( &retval,sizeof(int64_t)); n = controlSocket->ReceiveDataOnly( &retval,sizeof(int64_t));
thisDetector->timerValue[SUBFRAME_ACQUISITION_TIME]=retval; thisDetector->timerValue[SUBFRAME_ACQUISITION_TIME]=retval;

7
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -2585,14 +2585,11 @@ int set_timer(int file_des) {
strcpy(mess,"Sub Frame exposure time should not exceed 5.368 seconds\n"); strcpy(mess,"Sub Frame exposure time should not exceed 5.368 seconds\n");
break; break;
} }
#endif
retval = setTimer(ind,tns); retval = setTimer(ind,tns);
break; break;
#endif
#ifdef MYTHEN
case PROBES_NUMBER: case PROBES_NUMBER:
#ifndef MYTHEND
ret=FAIL;
strcpy(mess,"Not applicable/implemented for this detector\n");
break;
#endif #endif
case FRAME_NUMBER: case FRAME_NUMBER:
case ACQUISITION_TIME: case ACQUISITION_TIME: