detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 12:27:14 +02:00
Code Issues Actions Packages Releases Activity

merge conflict fixed in filename bug

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-08 12:09:10 +01:00
parent 7577d03e75 e19d564364
commit 1e849097ea
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5353,7 +5353,8 @@ string multiSlsDetector::setFileName(string s) {
if(!s.empty()){ if(!s.empty()){
fileIO::setFileName(s); fileIO::setFileName(s);
s=createReceiverFilePrefix(); if (thisMultiDetector->receiverOnlineFlag == ONLINE_FLAG)
s=createReceiverFilePrefix();
} }
if(!threadpool){ if(!threadpool){
@ -5387,7 +5388,7 @@ string multiSlsDetector::setFileName(string s) {
} }
} }
if ((ret != "error") || (ret != "")) { if ((thisMultiDetector->receiverOnlineFlag == ONLINE_FLAG) && ((ret != "error") || (ret != ""))) {
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Complete file prefix from receiver: " << ret << std::endl; std::cout << "Complete file prefix from receiver: " << ret << std::endl;
#endif #endif

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -8137,9 +8137,8 @@ string slsDetector::setFileName(string s) {
pthread_mutex_lock(&ms); pthread_mutex_lock(&ms);
fileIO::setFileName(parentDet->getNameFromReceiverFilePrefix(string(retval))); fileIO::setFileName(parentDet->getNameFromReceiverFilePrefix(string(retval)));
pthread_mutex_unlock(&ms); pthread_mutex_unlock(&ms);
*/ */
sretval = fileIO::getNameFromReceiverFilePrefix(string(retval)); sretval = fileIO::getNameFromReceiverFilePrefix(string(retval));
} }
if(ret==FORCE_UPDATE) if(ret==FORCE_UPDATE)