From 268fbd845f279322c5a5f7efaf4bd991001d9d18 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 10 Feb 2026 14:47:28 +0100 Subject: [PATCH] minor --- .../bin/ctbDetectorServer_developer | Bin 333448 -> 333448 bytes .../slsDetectorFunctionList.c | 4 ++-- .../slsDetectorFunctionList.h | 2 +- .../bin/jungfrauDetectorServer_developer | Bin 316708 -> 316708 bytes .../bin/moenchDetectorServer_developer | Bin 297608 -> 297608 bytes .../bin/xilinx_ctbDetectorServer_developer | Bin 306104 -> 306104 bytes .../slsDetectorFunctionList.c | 4 ++-- .../slsDetectorFunctionList.h | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index ffab4abcae93be3b4ca961cea8f3e542c9457b9a..02cf886640b38cf791647578a74d69b4bafaba34 100755 GIT binary patch delta 35 qcmeBJE7Gx6WP%ox*_G*xnk*8HF0C$%tu9QhF3hbiEL&YzUBm#=2nvA! delta 35 qcmeBJE7Gx6WP%nGzwvZNO%{npmsS_XRu`sL7v@$MmaQ(VE@A+_SqZrS 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 9e1596d5fd8232ee230ccb6b332c0a11572303c4..4e71a1a9c485d26b95e47a823851e879046728f4 100755 GIT binary patch delta 32 ocmZ3oN_fdC;R#wyX4j@CeqokqbZK>AY;|F3bz$D>!t&q>0MR%MX#fBK delta 32 ocmZ3oN_fdC;R#wy{3g>Azc5QQy0p45wz@F2x-f5bVR>)`0Kdx%pa1{> diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 3511928ceea507ed41bec9b7e08154fbf5a4767a..1282bf731b1d4f4afb1d15443b26b6d9b1c5cf8e 100755 GIT binary patch delta 32 ocmeB}D%3GmXo41#*^TLqo0ugUU0PijTV0r1U6{AJu()&q0Kvct{{R30 delta 32 ncmeB}D%3GmXo40KzuEN0P0SLFF0C$%tu9QhF3ek9SX{aQuu}>) diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer b/slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer index 070cf2482fcdfda1f7132111ede8081e21a58765..9f2671f51e524f6c4035d7412606e238a9b41a79 100755 GIT binary patch delta 7912 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 Di5IiP 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();