diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 2a4ab7134..e9951f230 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index e4ec00a8c..3f31b2158 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -699,14 +699,12 @@ int setExpTime(int64_t val) { } LOG(logINFO, ("Setting exptime %lld ns\n", (long long int)val)); val *= (1E-3 * CLK_RUN); - val -= ACQ_TIME_MIN_CLOCK; if (val < 0) { val = 0; } set64BitReg(val, SET_EXPTIME_LSB_REG, SET_EXPTIME_MSB_REG); // validate for tolerance - val += ACQ_TIME_MIN_CLOCK; int64_t retval = getExpTime(); val /= (1E-3 * CLK_RUN); if (val != retval) { @@ -716,8 +714,7 @@ int setExpTime(int64_t val) { } int64_t getExpTime() { - return (get64BitReg(SET_EXPTIME_LSB_REG, SET_EXPTIME_MSB_REG) + - ACQ_TIME_MIN_CLOCK) / + return get64BitReg(SET_EXPTIME_LSB_REG, SET_EXPTIME_MSB_REG) / (1E-3 * CLK_RUN); } diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h index 4eecb9264..9b9f23eb5 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h @@ -5,7 +5,7 @@ #include "sls/sls_detector_defs.h" #define REQRD_FRMWRE_VRSN_BOARD2 0x444445 // 1.0 pcb (version = 010) -#define REQRD_FRMWRE_VRSN 0x230710 // 2.0 pcb (version = 011) +#define REQRD_FRMWRE_VRSN 0x231026 // 2.0 pcb (version = 011) #define NUM_HARDWARE_VERSIONS (2) #define HARDWARE_VERSION_NUMBERS \ @@ -58,7 +58,6 @@ /* Defines in the Firmware */ #define MAX_TIMESLOT_VAL (0x1F) #define MAX_THRESHOLD_TEMP_VAL (127999) // millidegrees -#define ACQ_TIME_MIN_CLOCK (2) #define ASIC_FILTER_MAX_RES_VALUE (1) #define MAX_SELECT_CHIP10_VAL (63) diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 2aaa243c3..e08eb946e 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -2533,7 +2533,7 @@ int set_exptime(int file_des) { if (gateIndex != -1) { ret = FAIL; sprintf(mess, - "Could not get exposure time. Gate index not implemented " + "Could not set exposure time. Gate index not implemented " "for this detector\n"); LOG(logERROR, (mess)); } else { diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 04424011c..fdf00d6e8 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -9,5 +9,5 @@ #define APIGOTTHARD2 "developer 0x231109" #define APIJUNGFRAU "developer 0x231109" #define APIMYTHEN3 "developer 0x231109" -#define APIMOENCH "developer 0x231109" #define APIEIGER "developer 0x231109" +#define APIMOENCH "developer 0x231127"