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

format

Browse Source
This commit is contained in:
maliakal_d
2022-11-08 10:25:12 +01:00
parent 16e9b272c7
commit 4a95ee8362
6 changed files with 68 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -1050,10 +1050,11 @@ int Feb_Control_StopAcquisition() {
// check stuck only 2000 times (1s)
if (is_processing == STATUS_RUNNING) {
if (check_stuck == 2000) {
LOG(logERROR, ("Unable to get feb processing done signal\n"));
LOG(logERROR,
("Unable to get feb processing done signal\n"));
// at least it is idle
if (Feb_Control_AcquisitionInProgress() == STATUS_IDLE) {
return 1;
return 1;
}
LOG(logERROR, ("Unable to get acquisition done signal\n"));
return 0;
@ -1757,9 +1758,8 @@ int Feb_Control_ReadRegister(uint32_t offset, uint32_t *retval) {
}
// Inconsistent values when reading both registers
if ((run[0] & run[1]) & (value[0] != value[1])) {
LOG(logERROR,
("Inconsistent values read from %s 0x%x and %s 0x%x\n",
side[0], value[0], side[1], value[1]));
LOG(logERROR, ("Inconsistent values read from %s 0x%x and %s 0x%x\n",
side[0], value[0], side[1], value[1]));
return 0;
}
return 1;

20
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2185,8 +2185,9 @@ int setTrimbits(int *chanregs, char *mess) {
// if quad, set M8 and PROGRAM manually
if (!Feb_Control_SetChipSignalsToTrimQuad(1)) {
sprintf(mess, "Could not set module. Could not enable chip signals to set trimbits\n");
LOG(logERROR, (mess));
sprintf(mess, "Could not set module. Could not enable chip signals to "
"set trimbits\n");
LOG(logERROR, (mess));
sharedMemory_unlockLocalLink();
return FAIL;
}
@ -2200,8 +2201,9 @@ int setTrimbits(int *chanregs, char *mess) {
// if quad, reset M8 and PROGRAM manually
if (!Feb_Control_SetChipSignalsToTrimQuad(0)) {
sprintf(mess, "Could not set module. Could not disable chip signals to set trimbits\n");
LOG(logERROR, (mess));
sprintf(mess, "Could not set module. Could not disable chip "
"signals to set trimbits\n");
LOG(logERROR, (mess));
sharedMemory_unlockLocalLink();
return FAIL;
}
@ -2212,8 +2214,9 @@ int setTrimbits(int *chanregs, char *mess) {
// if quad, reset M8 and PROGRAM manually
if (!Feb_Control_SetChipSignalsToTrimQuad(0)) {
sprintf(mess, "Could not set module. Could not disable chip signals to set trimbits\n");
LOG(logERROR, (mess));
sprintf(mess, "Could not set module. Could not disable chip signals to "
"set trimbits\n");
LOG(logERROR, (mess));
sharedMemory_unlockLocalLink();
return FAIL;
}
@ -2816,8 +2819,9 @@ int stopStateMachine() {
// reset feb and beb
sharedMemory_lockLocalLink();
// uncommenting this out as it randomly does not set the processing bit to high
//Feb_Control_Reset();
// uncommenting this out as it randomly does not set the processing bit to
// high
// Feb_Control_Reset();
sharedMemory_unlockLocalLink();
if (!Beb_StopAcquisition()) {
LOG(logERROR, ("failed to stop acquisition\n"));