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

wip

Browse Source
This commit is contained in:
maliakal_d 2021-06-28 17:07:09 +02:00
parent f8c2da3c83
commit 4a4fbddb79
2 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorServers/eigerDetectorServer/Beb.c
View File

@ -1104,6 +1104,21 @@ int Beb_StopAcquisition() {
if (!Beb_activated) if (!Beb_activated)
return 1; return 1;
// 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"));
u_int32_t *csp0base = 0; u_int32_t *csp0base = 0;
volatile u_int32_t valuel, valuer; volatile u_int32_t valuel, valuer;
// open file pointer // open file pointer

28
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -1059,34 +1059,6 @@ int Feb_Control_StopAcquisition() {
check_error = 0; check_error = 0;
} }
// wait for detector to send
int isTransmitting = 1;
while (isTransmitting) {
// wait for feb processing to be done
int i = Feb_Control_ProcessingInProgress();
if (i == STATUS_ERROR) {
strcpy(mess, "Could not read feb processing done register\n");
*ret = (int)FAIL;
return;
}
if (i == RUNNING) {
LOG(logINFOBLUE, ("Status: TRANSMITTING (feb processing)\n"));
isTransmitting = 1;
}
// 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"));
// stop acquisition // stop acquisition
return Feb_Control_Reset(); return Feb_Control_Reset();
} }