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

fixed eiger test

Browse Source
This commit is contained in:
maliakal_d
2026-02-06 13:19:32 +01:00
parent 199cf336d5
commit 2fff72e867
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
+13 -16
View File
@@ -1525,29 +1525,26 @@ int getDAC(enum DACINDEX ind, int mV, int *retval, char *mess) {
}
if (ind == E_VTHRESHOLD) {
int retval[5] = {0};
if (getDAC(E_VCMP_LL, mV, &retval[0], mess) == FAIL)
int retvals[5] = {0};
if (getDAC(E_VCMP_LL, mV, &retvals[0], mess) == FAIL)
return FAIL;
if (getDAC(E_VCMP_LR, mV, &retval[1], mess) == FAIL)
if (getDAC(E_VCMP_LR, mV, &retvals[1], mess) == FAIL)
return FAIL;
if (getDAC(E_VCMP_RL, mV, &retval[2], mess) == FAIL)
if (getDAC(E_VCMP_RL, mV, &retvals[2], mess) == FAIL)
return FAIL;
if (getDAC(E_VCMP_RR, mV, &retval[3], mess) == FAIL)
if (getDAC(E_VCMP_RR, mV, &retvals[3], mess) == FAIL)
return FAIL;
if (getDAC(E_VCP, mV, &retval[4], mess) == FAIL)
if (getDAC(E_VCP, mV, &retvals[4], mess) == FAIL)
return FAIL;
if ((retval[0] != retval[1]) || (retval[1] != retval[2]) ||
(retval[2] != retval[3]) || (retval[3] != retval[4])) {
sprintf(mess,
"Vthreshold mismatch. vcmp_ll:%d vcmp_lr:%d vcmp_rl:%d "
"vcmp_rr:%d vcp:%d\n",
retval[0], retval[1], retval[2], retval[3], retval[4]);
LOG(logERROR, (mess));
return FAIL;
if ((retvals[0] != retvals[1]) || (retvals[1] != retvals[2]) ||
(retvals[2] != retvals[3]) || (retvals[3] != retvals[4])) {
LOG(logWARNING, ("Vthreshold mismatch. vcmp_ll:%d vcmp_lr:%d vcmp_rl:%d vcmp_rr:%d vcp:%d\n",retvals[0], retvals[1], retvals[2], retvals[3], retvals[4]));
*retval = -1;
return OK;
}
LOG(logINFO, ("\tvthreshold match\n"));
*retval = retval[0];
*retval = retvals[0];
LOG(logINFO, ("\tvthreshold match %d\n"), retval);
return OK;
}
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
+8 -4
View File
@@ -1715,13 +1715,17 @@ int getDAC(enum DACINDEX ind, int mV, int *retval, char *mess) {
}
// different values for enabled counters
else if (retval1 != *retval) {
sprintf(mess, "Could not get vthrehsold DAC. Different "
"values for enabled counters.\n");
LOG(logERROR, (mess));
return FAIL;
LOG(logWARNING,("Could not get threhsold dac. Different values for enabled counters.\n"));
*retval = -1;
return OK;
}
}
}
if (*retval == -1) {
sprintf(mess, "Could not get vthreshold dac.\n");
LOG(logERROR, (mess));
return FAIL;
}
LOG(logINFO, ("\tvthreshold match %d\n", retval));
return OK;
}