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

get detector and receiver status bug fixed

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-02-02 16:31:28 +01:00
parent 36d6538104
commit aeffb4b93f
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3278,14 +3278,14 @@ slsDetectorDefs::runStatus slsDetector::getRunStatus(){
stopSocket->SendDataOnly(&fnum,sizeof(fnum));
stopSocket->ReceiveDataOnly(&ret,sizeof(ret));
// cout << "________:::____________" << ret << endl;
//cout << "________:::____________" << ret << endl;
if (ret==FAIL) {
stopSocket->ReceiveDataOnly(mess,sizeof(mess));
std::cout<< "Detector returned error: " << mess << std::endl;
} else {
stopSocket->ReceiveDataOnly(&retval,sizeof(retval));
// cout << "____________________" << retval << endl;
//cout << "____________________" << retval << endl;
}
stopSocket->Disconnect();
}

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -1186,7 +1186,7 @@ string slsDetectorCommand::cmdStatus(int narg, char *args[], int action) {
} else if (action==HELP_ACTION) {
return helpStatus(narg,args,HELP_ACTION);
}
runStatus s=myDet->getRunStatus();
runStatus s=myDet->getRunStatus();
return myDet->runStatusType(s);
}