diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index ffab4abca..02cf88664 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index 734352ace..079a8fc1d 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -1257,7 +1257,7 @@ int getADCVpp(int mV, int *retval, char *mess) { return OK; } -int validateDAC(enum DACINDEX ind, int val, int mV, char *mess) { +int isDACValid(enum DACINDEX ind, int val, int mV, char *mess) { // validate index if (ind < 0 || ind >= NDAC) { sprintf(mess, "Could not set DAC %d. Invalid index.\n", ind); @@ -1353,7 +1353,7 @@ int validateDAC(enum DACINDEX ind, int val, int mV, char *mess) { } int setDAC(enum DACINDEX ind, int val, int mV, char *mess) { - if (validateDAC(ind, val, mV, mess) == FAIL) + if (isDACValid(ind, val, mV, mess) == FAIL) return FAIL; LOG(logINFO, ("Setting dac[%d]: %d %s \n", (int)ind, val, diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.h index 167d014a7..ffdc0641d 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.h +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.h @@ -126,7 +126,7 @@ enum detectorSettings getSettings(); int setADCVpp(int val, int mV, char *mess); int getADCVpp(int mV, int *retval, char *mess); -int validateDAC(enum DACINDEX ind, int val, int mV, char *mess); +int isDACValid(enum DACINDEX ind, int val, int mV, char *mess); int setDAC(enum DACINDEX ind, int val, int mV, char *mess); int getDAC(enum DACINDEX ind, int mV, int *retval, char *mess); int getVLimit(); diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 9e1596d5f..4e71a1a9c 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 3511928ce..1282bf731 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer index 070cf2482..9f2671f51 100755 Binary files a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer and b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer differ diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c index 829eaabc8..96860a466 100644 --- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c @@ -1161,7 +1161,7 @@ int64_t getMeasurementTime() { } /* parameters - dac, adc, hv */ -int validateDAC(enum DACINDEX ind, int val, int mV, char *mess) { +int isDACValid(enum DACINDEX ind, int val, int mV, char *mess) { // validate index if (ind < 0 || ind >= NDAC) { sprintf(mess, "Could not set DAC %d. Invalid index.\n", ind); @@ -1257,7 +1257,7 @@ int validateDAC(enum DACINDEX ind, int val, int mV, char *mess) { } int setDAC(enum DACINDEX ind, int val, int mV, char *mess) { - if (validateDAC(ind, val, mV, mess) == FAIL) + if (isDACValid(ind, val, mV, mess) == FAIL) return FAIL; LOG(logINFO, ("Setting dac[%d]: %d %s \n", (int)ind, val, diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h index 27f9d9043..3d5b10add 100644 --- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h +++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h @@ -119,7 +119,7 @@ int64_t getMeasurementTime(); int setModule(sls_detector_module myMod, char *mess); // parameters - dac, adc, hv -int validateDAC(enum DACINDEX ind, int val, int mV, char *mess); +int isDACValid(enum DACINDEX ind, int val, int mV, char *mess); int setDAC(enum DACINDEX ind, int val, int mV, char *mess); int getDAC(enum DACINDEX ind, int mV, int *retval, char *mess); int getVLimit();