Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software

This commit is contained in:
2015-02-04 09:28:09 +01:00
3 changed files with 21 additions and 18 deletions

View File

@ -3287,14 +3287,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();
}