From dd8082da0b67c193cd70cba6d85e52fe9c4284fd Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 28 Jun 2021 17:41:02 +0200 Subject: [PATCH] wip --- slsDetectorServers/eigerDetectorServer/FebControl.c | 7 ++++--- .../eigerDetectorServer/slsDetectorFunctionList.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c index 329b19fbe..176e73560 100644 --- a/slsDetectorServers/eigerDetectorServer/FebControl.c +++ b/slsDetectorServers/eigerDetectorServer/FebControl.c @@ -843,7 +843,7 @@ int Feb_Control_StartDAQOnlyNWaitForFinish(int sleep_time_us) { } int Feb_Control_Reset() { - LOG(logINFO, ("Reset daq\n")); + LOG(logINFO, ("Feb: Reset daq\n")); if (Feb_Control_activated) { if (!Feb_Interface_WriteRegister(Feb_Control_AddressToAll(), DAQ_REG_CTRL, 0, 0, 0) || @@ -1039,8 +1039,7 @@ int Feb_Control_StopAcquisition() { LOG(logERROR, ("Could not send last frames.\n")); return 0; } - LOG(logINFOBLUE, - ("send last frame value:0x%x\n", orig_value | DAQ_CTRL_STOP)); + LOG(logINFO, ("Feb: Command to Flush out images from fifo\n")); // wait for feb processing to be done int is_processing = Feb_Control_ProcessingInProgress(); @@ -1059,6 +1058,8 @@ int Feb_Control_StopAcquisition() { else check_error = 0; } + LOG(logINFO, ("Feb: Processing done (to stop acq)\n")); + return 0; } return 1; diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index ed8da637e..80cf7df51 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -2408,7 +2408,7 @@ int stopStateMachine() { printf("Transmitting...\n"); } } - LOG(logINFO, ("Detector has sent all data\n")); + LOG(logINFO, ("Beb: Detector has sent all data\n")); // reset feb and beb sharedMemory_lockLocalLink();