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

ctb 1g non blocking acquire (#555)

Browse Source 
* allowing ctb and moench 1g to have non blocking acquisition also send data, refactoring wait for acquisition finished for all others
This commit is contained in:
Dhanya Thattil
2022-09-16 17:45:51 +02:00
committed by GitHub
parent e385618d09
commit bac32dcba9
19 changed files with 99 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

13
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2765,7 +2765,7 @@ void *start_timer(void *arg) {
closeUDPSocket(1);
sharedMemory_setStatus(IDLE);
LOG(logINFOBLUE, ("Finished Acquiring\n"));
LOG(logINFOBLUE, ("Transmitting frames done\n"));
return NULL;
}
#endif
@ -2893,16 +2893,13 @@ enum runStatus getRunStatus() {
#endif
}
void readFrame(int *ret, char *mess) {
void waitForAcquisitionEnd(int *ret, char *mess) {
#ifdef VIRTUAL
// wait for status to be done
while (sharedMemory_getStatus() == RUNNING) {
usleep(500);
}
LOG(logINFOGREEN, ("acquisition successfully finished\n"));
return;
#else
sharedMemory_lockLocalLink();
if (Feb_Control_WaitForFinishedFlag(5000, 1) == STATUS_ERROR) {
sharedMemory_unlockLocalLink();
@ -2911,7 +2908,7 @@ void readFrame(int *ret, char *mess) {
return;
}
sharedMemory_unlockLocalLink();
LOG(logINFOGREEN, ("Acquisition finished\n"));
LOG(logINFO, ("Acquisition done\n"));
// wait for detector to send
int isTransmitting = 1;
@ -2940,9 +2937,9 @@ void readFrame(int *ret, char *mess) {
printf("Transmitting...\n");
}
}
LOG(logINFO, ("Beb: Detector has sent all data (acquire)\n"));
LOG(logINFOGREEN, ("Acquisition successfully finished\n"));
LOG(logINFOBLUE, ("Transmitting frames done\n"));
#endif
LOG(logINFOGREEN, ("Blocking Acquisition done\n"));
}
/* common */