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

wip

Browse Source
This commit is contained in:
maliakal_d
2021-06-28 17:20:37 +02:00
parent 28fde55e4b
commit 5177ed74e5
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/eigerDetectorServer/FebControl.c
View File

@ -1060,7 +1060,7 @@ int Feb_Control_StopAcquisition() {
}
// stop acquisition
return Feb_Control_Reset();
// return Feb_Control_Reset();
}
return 1;
}

3
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -2408,8 +2408,6 @@ int stopStateMachine() {
}
LOG(logINFO, ("Detector has sent all data\n"));
Feb_Control_Reset();
if (!Beb_StopAcquisition()) {
LOG(logERROR, ("failed to stop acquisition\n"));
sharedMemory_unlockLocalLink();
@ -2418,6 +2416,7 @@ int stopStateMachine() {
sharedMemory_unlockLocalLink();
Feb_Control_Reset();
// ensure all have same starting frame numbers
uint64_t retval = 0;
if (Beb_GetNextFrameNumber(&retval, send_to_ten_gig) == -2) {