From e19d56436467d555feb1bbe49f4030266448536e Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 8 Dec 2017 12:04:59 +0100 Subject: [PATCH] bug fix no reciever could not set file name for mythen for eg., also bug fix that did not allow _s, _S, _p, _d as suffix to file name --- .../multiSlsDetector/multiSlsDetector.cpp | 5 +++-- .../slsDetector/slsDetector.cpp | 21 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 7a934f26c..84c0d2af2 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -5274,7 +5274,8 @@ string multiSlsDetector::setFileName(string s) { if(!s.empty()){ fileIO::setFileName(s); - s=createReceiverFilePrefix(); + if (thisMultiDetector->receiverOnlineFlag == ONLINE_FLAG) + s=createReceiverFilePrefix(); } if(!threadpool){ @@ -5308,7 +5309,7 @@ string multiSlsDetector::setFileName(string s) { } } - if ((ret != "error") || (ret != "")) { + if ((thisMultiDetector->receiverOnlineFlag == ONLINE_FLAG) && ((ret != "error") || (ret != ""))) { #ifdef VERBOSE std::cout << "Complete file prefix from receiver: " << ret << std::endl; #endif diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 1af8e6076..9f3d8b4de 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -7907,21 +7907,28 @@ string slsDetector::setFileName(string s) { pthread_mutex_lock(&ms); fileIO::setFileName(parentDet->getNameFromReceiverFilePrefix(string(retval))); pthread_mutex_unlock(&ms); - */ + */ sretval = fileIO::getNameFromReceiverFilePrefix(string(retval)); - } if(ret==FORCE_UPDATE) updateReceiver(); + return sretval; } - /*pthread_mutex_lock(&ms); - s = fileIO::getFileName(); - pthread_mutex_unlock(&ms); + // no reciever + else { + if(!s.empty()){ + pthread_mutex_lock(&ms); + fileIO::setFileName(s); + pthread_mutex_unlock(&ms); + } + pthread_mutex_lock(&ms); + s = fileIO::getFileName(); + pthread_mutex_unlock(&ms); - return s;*/ - return sretval; + return s; + } }