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

merge ocnflict for white background

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-28 11:29:15 +01:00
parent 4466213882 a351fa8f28
commit a89847538d
17 changed files with 101 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/src/HDF5File.cpp
View File

@ -109,7 +109,7 @@ int HDF5File::CreateFile(uint64_t fnum) {
}
pthread_mutex_unlock(&Mutex);
if (dataspace == NULL)
bprintf(RED,"Got nothing!\n");
cprintf(RED,"Got nothing!\n");
if(!silentMode)
FILE_LOG(logINFO) << *udpPortNumber << ": HDF5 File created: " << currentFileName;
@ -158,7 +158,7 @@ int HDF5File::WriteToFile(char* buffer, int buffersize, uint64_t fnum, uint32_t
}
}
pthread_mutex_unlock(&Mutex);
bprintf(RED,"%d Error: Write to file failed\n", index);
cprintf(RED,"%d Error: Write to file failed\n", index);
return FAIL;
}