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

m3:different exception message for vths when counter disabled

Browse Source
This commit is contained in:
maliakal_d
2021-05-26 12:23:46 +02:00
parent 240ec12485
commit 89898beced
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1240,11 +1240,29 @@ int validateAndSetDac(enum dacIndex ind, int val, int mV) {
ret = FAIL; ret = FAIL;
#ifdef MYTHEN3D #ifdef MYTHEN3D
// give a different exception message if counter not enabled // give a different exception message if counter not enabled
uint32_t counter_retval = getCounterMask(); int isCounterError = 0;
if ((serverDacIndex == M_VTHRESHOLD || if (serverDacIndex == M_VTHRESHOLD ||
serverDacIndex == M_VTH1 || serverDacIndex == M_VTH2 || serverDacIndex == M_VTH1 || serverDacIndex == M_VTH2 ||
serverDacIndex == M_VTH3) && serverDacIndex == M_VTH3) {
counter_retval != MAX_COUNTER_MSK) { uint32_t counter_retval = getCounterMask();
// vthreshold, all counters should have been enabled
if (serverDacIndex == M_VTHRESHOLD) {
if (counter_retval != MAX_COUNTER_MSK) {
isCounterError = 1;
}
}
// corresponding counter should have been enabled
else {
int vthdacs[] = {M_VTH1, M_VTH2, M_VTH3};
for (int i = 0; i < NCOUNTERS; ++i) {
if ((vthdacs[i] == (int)serverDacIndex) &&
(!(counter_retval & (1 << i)))) {
isCounterError = 1;
}
}
}
}
if (isCounterError) {
strcpy(mess, "Could not set dac as counter disabled\n"); strcpy(mess, "Could not set dac as counter disabled\n");
} else } else
#endif #endif