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

merge conflict from 3.0.1

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-17 11:35:15 +01:00
parent db2fef5d69 823d537825
commit 1dee950870
7 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsReceiverSoftware/src/BinaryFile.cpp
View File

@ -53,8 +53,9 @@ int BinaryFile::CreateFile(uint64_t fnum) {
if (BinaryFileStatic::CreateDataFile(filefd, *overWriteEnable, currentFileName, FILE_BUFFER_SIZE) == FAIL)
return FAIL;
if(!silentMode)
if(!silentMode) {
FILE_LOG(logINFO) << "[" << *udpPortNumber << "]: Binary File created: " << currentFileName;
}
return OK;
}
@ -90,8 +91,9 @@ int BinaryFile::CreateMasterFile(bool en, uint32_t size,
if (master && (*detIndex==0)) {
masterFileName = BinaryFileStatic::CreateMasterFileName(filePath, fileNamePrefix, *fileIndex);
if(!silentMode)
if(!silentMode) {
FILE_LOG(logINFO) << "Master File: " << masterFileName;
}
return BinaryFileStatic::CreateMasterDataFile(masterfd, masterFileName, *overWriteEnable,
*dynamicRange, en, size, nx, ny, *numImages,
at, st, ap, BINARY_WRITER_VERSION);