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

This commit is contained in:
2015-06-12 13:00:21 +02:00
17 changed files with 1042 additions and 853 deletions

View File

@ -4259,11 +4259,11 @@ string slsDetectorCommand::cmdReceiver(int narg, char *args[], int action) {
myDet->startReceiver();
else if(!strcasecmp(args[1],"stop")){
myDet->startReceiverReadout();
runStatus s = myDet->getReceiverStatus();
/*runStatus s = myDet->getReceiverStatus();
while(s != RUN_FINISHED){
usleep(50000);
s = myDet->getReceiverStatus();
}
}*/
myDet->stopReceiver();
}
else