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

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-12-08 11:50:15 +01:00
commit 7577d03e75
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4194,10 +4194,16 @@ int slsDetector::startAcquisition(){
}; };
int slsDetector::stopAcquisition(){ int slsDetector::stopAcquisition(){
runStatus s = getRunStatus(); // get status before stopping acquisition
runStatus r = getReceiverStatus(); runStatus s = ERROR, r = ERROR;
if (thisDetector->receiver_upstream) {
s = getRunStatus();
r = getReceiverStatus();
}
int fnum=F_STOP_ACQUISITION; int fnum=F_STOP_ACQUISITION;
int ret=FAIL; int ret=FAIL;
@ -4221,6 +4227,7 @@ int slsDetector::stopAcquisition(){
} }
thisDetector->stoppedFlag=1; thisDetector->stoppedFlag=1;
// if rxr streaming and acquisition finished, restream dummy stop packet
if ((thisDetector->receiver_upstream) && (s == IDLE) && (r == IDLE)) { if ((thisDetector->receiver_upstream) && (s == IDLE) && (r == IDLE)) {
restreamStopFromReceiver(); restreamStopFromReceiver();
} }