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

conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-08 11:45:29 +01:00
parent 4718378d0a 40a7b3983a
commit 6e876d79ee
8 changed files with 28 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4196,6 +4196,9 @@ int slsDetector::startAcquisition(){
};
int slsDetector::stopAcquisition(){
runStatus s = getRunStatus();
runStatus r = getReceiverStatus();
int fnum=F_STOP_ACQUISITION;
int ret=FAIL;
char mess[MAX_STR_LENGTH]="";
@ -4217,6 +4220,11 @@ int slsDetector::stopAcquisition(){
}
}
thisDetector->stoppedFlag=1;
if ((thisDetector->receiver_upstream) && (s == IDLE) && (r == IDLE)) {
restreamStopFromReceiver();
}
return ret;
@ -9446,8 +9454,10 @@ int slsDetector::restreamStopFromReceiver(){
}
if(ret==FORCE_UPDATE)
ret=updateReceiver();
else if (ret == FAIL)
else if (ret == FAIL) {
setErrorMask((getErrorMask())|(RESTREAM_STOP_FROM_RECEIVER));
std::cout << " Could not restream stop dummy packet from receiver" << endl;
}
}
return ret;