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

Fixed filename problem with CPU readout and trimval command for mythen

Browse Source
This commit is contained in:
bergamaschi
2017-11-22 12:34:14 +01:00
parent 5f0575236e
commit dcfa6fb100
4 changed files with 106 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2725,6 +2725,8 @@ int slsDetector::setChannel(sls_detector_channel chan){
int ichip=chan.chip;
int imod=chan.module;
cout << "Set chan " << ichan << " chip " <<ichip << " mod " << imod << " reg " << hex << chan.reg << endl;
if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (connectControl() == OK){
controlSocket->SendDataOnly(&fnum,sizeof(fnum));
@ -8062,14 +8064,22 @@ string slsDetector::setFileName(string s) {
if(ret==FORCE_UPDATE)
updateReceiver();
return sretval;
} 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;
}
/*pthread_mutex_lock(&ms);
s = fileIO::getFileName();
pthread_mutex_unlock(&ms);
return s;*/
return sretval;
}