detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-21 00:08:41 +01:00
Code Issues Actions Packages Releases Activity

minor
All checks were successful
Build on RHEL9 / build (push) Successful in 3m57s
Details
Build on RHEL8 / build (push) Successful in 4m58s
Details
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m40s
Details
Run Simulator Tests on local RHEL8 / build (push) Successful in 16m57s
Details

Browse Source
This commit is contained in:
maliakal_d
2026-02-10 14:47:28 +01:00
parent affc3bd845
commit 268fbd845f
8 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

4
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@@ -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,

2
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.h
View File

@@ -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();

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer
View File

Binary file not shown.

4
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
View File

@@ -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,

2
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.h
View File

@@ -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();