diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 81a5ac601..27444ca07 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -4928,7 +4928,7 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus(){ int multiSlsDetector::getFramesCaughtByReceiver() { int ret=0,ret1=0; - +/* if(thisMultiDetector->numberOfDetectors>10) { if (detectors[0]){ ret =detectors[0]->getFramesCaughtByReceiver(); @@ -4937,6 +4937,7 @@ int multiSlsDetector::getFramesCaughtByReceiver() { } return ret; } + */ for (int i=0; inumberOfDetectors; i++) if (detectors[i]){ diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 27220c553..6953819a2 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -7143,7 +7143,11 @@ string slsDetector::setFileName(string s) { } } - return fileIO::getFileName(); + pthread_mutex_lock(&ms); + s = fileIO::getFileName(); + pthread_mutex_unlock(&ms); + + return s; } diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp index 7912a4bf3..f35b66690 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp @@ -496,21 +496,24 @@ void* postProcessing::processData(int delflag) { else{ int caught = -1; while(true){ - //cout.flush(); - //cout<