diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c index 0d03b933d..219ae35c5 100755 --- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c @@ -2132,6 +2132,16 @@ int send_update(int file_des) { n = sendData(file_des,&i64,sizeof(i64),INT64); if (n < 0) return printSocketReadError(); +#ifdef CHIPTESTBOARDD + i64 = setTimer(SAMPLES,GET_FLAG); + n = sendData(file_des,&i64,sizeof(i64),INT64); + if (n < 0) return printSocketReadError(); + + i32 = setReadOutFlags(GET_READOUT_FLAGS); + n = sendData(file_des,&i32,sizeof(i32),INT32); + if (n < 0) return printSocketReadError(); +#endif + if (lockStatus == 0) { strcpy(lastClientIP,thisClientIP); } diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 3d82db206..e3b25b948 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -1848,18 +1848,11 @@ int64_t slsDetector::setTimer(timerIndex index, int64_t t) { } } - // setting timers consequences (eiger (ratecorr) and jctb (databytes)) + // setting timers consequences (eiger (ratecorr) ) // (a get can also change timer value, hence check difference) if (oldtimer != thisDetector->timerValue[index]) { - // jctb: change samples, change databytes - if (thisDetector->myDetectorType == CHIPTESTBOARD) { - if (index == SAMPLES) { - setDynamicRange(); - FILE_LOG(logINFO) << "Changing samples: data size = " << thisDetector->dataBytes; - } - } // eiger: change exptime/subexptime, set rate correction to update table - else if (thisDetector->myDetectorType == EIGER) { + if (thisDetector->myDetectorType == EIGER) { int dr = thisDetector->dynamicRange; if ((dr == 32 && index == SUBFRAME_ACQUISITION_TIME) || (dr == 16 && index == ACQUISITION_TIME)) {