diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index dbb522235..1ccad502e 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -1523,8 +1523,7 @@ int multiSlsDetector::startAndReadAllNoWait(){ */ slsDetectorDefs::runStatus multiSlsDetector::getRunStatus() { - runStatus s,s1; - + runStatus s = IDLE,s1 = IDLE; if (thisMultiDetector->masterPosition>=0) if (detectors[thisMultiDetector->masterPosition]){ s = detectors[thisMultiDetector->masterPosition]->getRunStatus(); @@ -4420,7 +4419,7 @@ int multiSlsDetector::stopReceiver(){ slsDetectorDefs::runStatus multiSlsDetector::startReceiverReadout(){ int i=0; - runStatus s,s1; + runStatus s = IDLE,s1 = IDLE; i=thisMultiDetector->masterPosition; if (thisMultiDetector->masterPosition>=0) { if (detectors[i]) { @@ -4437,18 +4436,20 @@ slsDetectorDefs::runStatus multiSlsDetector::startReceiverReadout(){ setErrorMask(getErrorMask()|(1<masterPosition>=0) if (detectors[thisMultiDetector->masterPosition]){ diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 09586844e..4939b0482 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -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(); } diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 7c1f36179..3fefc3a3c 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -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); }