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

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

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-08 12:04:59 +01:00
parent 8c123982d2
commit e19d564364
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5274,7 +5274,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){
@ -5308,7 +5309,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

21
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -7907,21 +7907,28 @@ 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)
updateReceiver(); updateReceiver();
return sretval;
} }
/*pthread_mutex_lock(&ms); // no reciever
s = fileIO::getFileName(); else {
pthread_mutex_unlock(&ms); 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 s;
return sretval; }
} }