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

wip

Browse Source
This commit is contained in:
maliakal_d 2021-06-28 17:41:02 +02:00
parent 60d726b379
commit dd8082da0b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -843,7 +843,7 @@ int Feb_Control_StartDAQOnlyNWaitForFinish(int sleep_time_us) {
} }
int Feb_Control_Reset() { int Feb_Control_Reset() {
LOG(logINFO, ("Reset daq\n")); LOG(logINFO, ("Feb: Reset daq\n"));
if (Feb_Control_activated) { if (Feb_Control_activated) {
if (!Feb_Interface_WriteRegister(Feb_Control_AddressToAll(), if (!Feb_Interface_WriteRegister(Feb_Control_AddressToAll(),
DAQ_REG_CTRL, 0, 0, 0) || DAQ_REG_CTRL, 0, 0, 0) ||
@ -1039,8 +1039,7 @@ int Feb_Control_StopAcquisition() {
LOG(logERROR, ("Could not send last frames.\n")); LOG(logERROR, ("Could not send last frames.\n"));
return 0; return 0;
} }
LOG(logINFOBLUE, LOG(logINFO, ("Feb: Command to Flush out images from fifo\n"));
("send last frame value:0x%x\n", orig_value | DAQ_CTRL_STOP));
// wait for feb processing to be done // wait for feb processing to be done
int is_processing = Feb_Control_ProcessingInProgress(); int is_processing = Feb_Control_ProcessingInProgress();
@ -1059,6 +1058,8 @@ int Feb_Control_StopAcquisition() {
else else
check_error = 0; check_error = 0;
} }
LOG(logINFO, ("Feb: Processing done (to stop acq)\n"));
return 0; return 0;
} }
return 1; return 1;

2
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2408,7 +2408,7 @@ int stopStateMachine() {
printf("Transmitting...\n"); printf("Transmitting...\n");
} }
} }
LOG(logINFO, ("Detector has sent all data\n")); LOG(logINFO, ("Beb: Detector has sent all data\n"));
// reset feb and beb // reset feb and beb
sharedMemory_lockLocalLink(); sharedMemory_lockLocalLink();