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

wip

Browse Source
This commit is contained in:
maliakal_d
2021-06-28 17:09:37 +02:00
parent 4a4fbddb79
commit 2a85e7c71e
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2394,6 +2394,28 @@ int stopStateMachine() {
sharedMemory_unlockLocalLink(); sharedMemory_unlockLocalLink();
return FAIL; return FAIL;
} }
// wait for detector to send
int isTransmitting = 1;
while (isTransmitting) {
// wait for beb to send out all packets
if (Beb_IsTransmitting(&isTransmitting, send_to_ten_gig, 1) == FAIL) {
strcpy(mess, "Could not read delay counters\n");
*ret = (int)FAIL;
return;
}
if (isTransmitting) {
printf("Transmitting...\n");
}
}
LOG(logINFO, ("Detector has sent all data\n"));
if (!Beb_StopAcquisition()) {
LOG(logERROR, ("failed to stop acquisition\n"));
sharedMemory_unlockLocalLink();
return FAIL;
}
sharedMemory_unlockLocalLink(); sharedMemory_unlockLocalLink();
// ensure all have same starting frame numbers // ensure all have same starting frame numbers
@ -2515,12 +2537,12 @@ void readFrame(int *ret, char *mess) {
int i = Feb_Control_ProcessingInProgress(); int i = Feb_Control_ProcessingInProgress();
if (i == STATUS_ERROR) { if (i == STATUS_ERROR) {
strcpy(mess, "Could not read feb processing done register\n"); strcpy(mess, "Could not read feb processing done register\n");
*ret = (int)FAIL; *ret = (int)FAIL;
return; return;
} }
if (i == RUNNING) { if (i == RUNNING) {
LOG(logINFOBLUE, ("Status: TRANSMITTING (feb processing)\n")); LOG(logINFOBLUE, ("Status: TRANSMITTING (feb processing)\n"));
isTransmitting = 1; isTransmitting = 1;
} }
// wait for beb to send out all packets // wait for beb to send out all packets