detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

m3: vthreshold and vthx gives correct exception messages (binaries not in)

Browse Source
This commit is contained in:
maliakal_d
2021-05-25 16:46:01 +02:00
parent 9ac836c2f4
commit d9525e9a92
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -1213,19 +1213,6 @@ int validateAndSetDac(enum dacIndex ind, int val, int mV) {
setDAC(serverDacIndex, val, mV); setDAC(serverDacIndex, val, mV);
retval = getDAC(serverDacIndex, mV); retval = getDAC(serverDacIndex, mV);
} }
#ifdef MYTHEN3D
if (serverDacIndex == M_VTHRESHOLD && retval == -1) {
ret = FAIL;
uint32_t counter_retval = getCounterMask();
if (counter_retval != MAX_COUNTER_MSK) {
strcpy(mess, "Could not set all threshold dacs as not all "
"counters enabled\n");
} else {
sprintf(mess, "Could not set all threshold dacs\n");
}
LOG(logERROR, (mess));
}
#endif
#ifdef EIGERD #ifdef EIGERD
if (val != GET_FLAG && getSettings() != UNDEFINED) { if (val != GET_FLAG && getSettings() != UNDEFINED) {
// changing dac changes settings to undefined // changing dac changes settings to undefined
@ -1251,8 +1238,18 @@ int validateAndSetDac(enum dacIndex ind, int val, int mV) {
ret = OK; ret = OK;
} else { } else {
ret = FAIL; ret = FAIL;
sprintf(mess, "Setting dac %d : wrote %d but read %d\n", #ifdef MYTHEN3D
serverDacIndex, val, retval); // give a different exception message if counter not enabled
uint32_t counter_retval = getCounterMask();
if ((serverDacIndex == M_VTHRESHOLD ||
serverDacIndex == M_VTH1 || serverDacIndex == M_VTH2 ||
serverDacIndex == M_VTH3) &&
counter_retval != MAX_COUNTER_MSK) {
strcpy(mess, "Could not set dac as counter disabled\n");
} else
#endif
sprintf(mess, "Setting dac %d : wrote %d but read %d\n",
serverDacIndex, val, retval);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} }
} }