detectors/slsDetectorPackage
24
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-12-30 16:11:19 +01:00
Code Issues Actions Packages Releases Activity

corrected bug fix in r_restreamstop

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-06 19:21:28 +01:00
parent 24c305ec59
commit 4718378d0a
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@@ -6064,11 +6064,22 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
if (action==GET_ACTION) if (action==GET_ACTION)
return string("cannot get"); return string("cannot get");
else { else {
if ((myDet->getRunStatus() != IDLE) || (myDet->getReceiverStatus() != IDLE)) { runStatus s = myDet->getRunStatus();
std::cout << "Could not restream stop from receiver. Acquisition still in progress" << std::endl; if (s != IDLE) {
std::cout << "Could not restream stop from receiver.\n"
"Detector Acquisition still in progress. Status: " << myDet->runStatusType(s) << std::endl;
sprintf(answer,"%d",0); sprintf(answer,"%d",0);
return string (answer);
} }
sprintf(answer,"%d",(myDet->restreamStopFromReceiver() == OK) ? 1 : 0); s = myDet->getReceiverStatus();
if (s != IDLE) {
std::cout << "Could not restream stop from receiver.\n"
"Receiver Acquisition still in progress. Status: " << myDet->runStatusType(s) << std::endl;
sprintf(answer,"%d",0);
return string (answer);
}
else
sprintf(answer,"%d",(myDet->restreamStopFromReceiver() == OK) ? 1 : 0);
} }
return string(answer); return string(answer);
} }