detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-17 15:27: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

5
slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp
View File

@ -8,6 +8,8 @@
/* generates file name without extension*/
string fileIO::createFileName() {
pthread_mutex_lock(&mf);
currentFileName=fileIOStatic::createFileName(filePath, \
fileName, \
getActionMask(), \
@ -26,6 +28,7 @@ string fileIO::createFileName() {
// nBytes=2*getTotalNumberOfChannels();
//} else
nBytes=getDataBytes();
pthread_mutex_unlock(&mf);
return currentFileName;
}
@ -35,6 +38,7 @@ string fileIO::createFileName() {
/* generates file prefix for receivers */
string fileIO::createReceiverFilePrefix() {
pthread_mutex_lock(&mf);
currentReceiverFilePrefix=fileIOStatic::createReceiverFilePrefix(fileName, \
getActionMask(), \
getCurrentScanVariable(0), \
@ -45,6 +49,7 @@ string fileIO::createReceiverFilePrefix() {
getNumberOfPositions(), \
detIndex \
);
pthread_mutex_unlock(&mf);
return currentReceiverFilePrefix;
}