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

refactoring
All checks were successful
Build on RHEL9 / build (push) Successful in 3m35s
Details
Build on RHEL8 / build (push) Successful in 4m39s
Details
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m39s
Details
Run Simulator Tests on local RHEL8 / build (push) Successful in 17m1s
Details

Browse Source
This commit is contained in:
maliakal_d
2026-02-10 15:07:49 +01:00
parent 268fbd845f
commit bb31575cdd
6 changed files with 96 additions and 96 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.

96
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@@ -1296,59 +1296,59 @@ int isDACValid(enum DACINDEX ind, int val, int mV, char *mess) {
return FAIL;
}
}
// validate max value
if (val != LTC2620_GetPowerDownValue()) {
if (!mV) {
// dacs and power regs
if (val > LTC2620_GetMaxInput()) {
sprintf(
mess,
"Could not set DAC %d. Input %d exceeds max dac value %d\n",
(int)ind, val, LTC2620_GetMaxInput());
LOG(logERROR, (mess))
return FAIL;
}
// check vLimit - only dacs, convert to mV
if (vLimit > 0 && ind < NDAC_ONLY) {
int dacmV = 0;
if (LTC2620_DacToVoltage(val, &dacmV) == FAIL) {
sprintf(mess,
"Could not set DAC %d. Could not convert input %d "
"to mV\n",
ind, val);
LOG(logERROR, (mess));
return FAIL;
}
if (dacmV > vLimit) {
sprintf(mess,
"Could not set DAC %d. Input %d (%d mV) exceeds "
"vLimit value %d\n",
ind, val, dacmV, vLimit);
LOG(logERROR, (mess));
return FAIL;
}
}
if (val == LTC2620_GetPowerDownValue())
return OK;
// validate max value/ vlimit
// only dacs here in mV
if (mV) {
if (val > DAC_MAX_MV) {
sprintf(mess,
"Could not set DAC %d. Input %d mV exceeds max dac "
"value %d mV\n",
ind, val, DAC_MAX_MV);
LOG(logERROR, (mess))
return FAIL;
}
// only dacs in mV here
else {
if (val > DAC_MAX_MV) {
sprintf(mess,
"Could not set DAC %d. Input %d mV exceeds max dac "
"value %d mV\n",
ind, val, DAC_MAX_MV);
LOG(logERROR, (mess))
return FAIL;
}
if (vLimit > 0 && val > vLimit) {
sprintf(
mess,
if (vLimit > 0 && val > vLimit) {
sprintf(mess,
"Could not set DAC %d. Input %d mV exceeds vLimit %d mV\n",
(int)ind, val, vLimit);
LOG(logERROR, (mess))
return FAIL;
}
LOG(logERROR, (mess))
return FAIL;
}
return OK;
}
// dacs and power regs
if (val > LTC2620_GetMaxInput()) {
sprintf(mess,
"Could not set DAC %d. Input %d exceeds max dac value %d\n",
(int)ind, val, LTC2620_GetMaxInput());
LOG(logERROR, (mess))
return FAIL;
}
// vlimit check for only dacs, convert to mV (power regs checked before)
if (vLimit > 0 && ind < NDAC_ONLY) {
int dacmV = 0;
if (LTC2620_DacToVoltage(val, &dacmV) == FAIL) {
sprintf(mess,
"Could not set DAC %d. Could not convert input %d "
"to mV\n",
ind, val);
LOG(logERROR, (mess));
return FAIL;
}
if (dacmV > vLimit) {
sprintf(mess,
"Could not set DAC %d. Input %d (%d mV) exceeds "
"vLimit value %d\n",
ind, val, dacmV, vLimit);
LOG(logERROR, (mess));
return FAIL;
}
}
return OK;
}

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.

96
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
View File

@@ -1200,59 +1200,59 @@ int isDACValid(enum DACINDEX ind, int val, int mV, char *mess) {
return FAIL;
}
}
// validate max value
if (val != LTC2620_D_GetPowerDownValue()) {
if (!mV) {
// dacs and power regs
if (val > LTC2620_D_GetMaxInput()) {
sprintf(
mess,
"Could not set DAC %d. Input %d exceeds max dac value %d\n",
ind, val, LTC2620_D_GetMaxInput());
LOG(logERROR, (mess))
return FAIL;
}
// check vLimit - only dacs, convert to mV
if (vLimit > 0 && ind < NDAC_ONLY) {
int dacmV = 0;
if (LTC2620_D_DacToVoltage(val, &dacmV) == FAIL) {
sprintf(mess,
"Could not set DAC %d. Could not convert input %d "
"to mV\n",
(int)ind, val);
LOG(logERROR, (mess));
return FAIL;
}
if (dacmV > vLimit) {
sprintf(mess,
"Could not set DAC %d. Input %d (%d mV) exceeds "
"vLimit value %d\n",
ind, val, dacmV, vLimit);
LOG(logERROR, (mess));
return FAIL;
}
}
if (val == LTC2620_D_GetPowerDownValue())
return OK;
// validate max value/ vlimit
// only dacs here in mV
if (mV) {
if (val > DAC_MAX_MV) {
sprintf(mess,
"Could not set DAC %d. Input %d mV exceeds max dac "
"value %d mV\n",
(int)ind, val, DAC_MAX_MV);
LOG(logERROR, (mess))
return FAIL;
}
// only dacs in mV here
else {
if (val > DAC_MAX_MV) {
sprintf(mess,
"Could not set DAC %d. Input %d mV exceeds max dac "
"value %d mV\n",
(int)ind, val, DAC_MAX_MV);
LOG(logERROR, (mess))
return FAIL;
}
if (vLimit > 0 && val > vLimit) {
sprintf(
mess,
if (vLimit > 0 && val > vLimit) {
sprintf(mess,
"Could not set DAC %d. Input %d mV exceeds vLimit %d mV\n",
ind, val, vLimit);
LOG(logERROR, (mess))
return FAIL;
}
LOG(logERROR, (mess))
return FAIL;
}
return OK;
}
// dacs and power regs
if (val > LTC2620_D_GetMaxInput()) {
sprintf(mess,
"Could not set DAC %d. Input %d exceeds max dac value %d\n",
ind, val, LTC2620_D_GetMaxInput());
LOG(logERROR, (mess))
return FAIL;
}
// vlimit check for only dacs, convert to mV (power regs checked before)
if (vLimit > 0 && ind < NDAC_ONLY) {
int dacmV = 0;
if (LTC2620_D_DacToVoltage(val, &dacmV) == FAIL) {
sprintf(mess,
"Could not set DAC %d. Could not convert input %d "
"to mV\n",
(int)ind, val);
LOG(logERROR, (mess));
return FAIL;
}
if (dacmV > vLimit) {
sprintf(mess,
"Could not set DAC %d. Input %d (%d mV) exceeds "
"vLimit value %d\n",
ind, val, dacmV, vLimit);
LOG(logERROR, (mess));
return FAIL;
}
}
return OK;
}