diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 3e1503d63..525a9a297 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer index 9d27e96ba..61bcf0719 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/src/loadPattern.c b/slsDetectorServers/slsDetectorServer/src/loadPattern.c index d80d5e742..64e97c178 100644 --- a/slsDetectorServers/slsDetectorServer/src/loadPattern.c +++ b/slsDetectorServers/slsDetectorServer/src/loadPattern.c @@ -355,18 +355,20 @@ int validate_setPatternWaitClocksAndInterval(char *message, int level, runclk = getFrequency(SYSTEM_C0); #endif uint64_t arg_clocks = ns_to_clocks(waittime, runclk); - uint64_t retval_clocks = getPatternWaitClocks(0); + uint64_t retval_clocks = getPatternWaitClocks(level); if (arg_clocks != retval_clocks) { sprintf(message, - "Failed to set exposure time. Could not set number of clocks " + "Failed to set pattern loop %d wait interval. Could not set " + "number of " + "clocks " "to %lld, read %lld\n", - (long long int)arg_clocks, (long long int)retval_clocks); + level, (long long int)arg_clocks, (long long int)retval_clocks); LOG(logERROR, (message)); return FAIL; } // log rounding if any - int64_t retval = getPatternWaitInterval(0); + uint64_t retval = getPatternWaitInterval(level); if (waittime != retval) { LOG(logWARNING, ("Rounding to %lld ns due to clock frequency\n", (long long int)retval)); diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer index 00b44294a..5d604b78a 100755 Binary files a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer and b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer differ