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

incorrect printout to MB

Browse Source
This commit is contained in:
maliakal_d 2020-01-28 10:43:06 +01:00
parent d9b88ea7d2
commit c42b4b8c0e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/src/Fifo.cpp
View File

@ -55,7 +55,7 @@ void Fifo::CreateFifos(uint32_t fifoItemSize) {
for (size_t i = 0; i < mem_len; i += pagesize) { for (size_t i = 0; i < mem_len; i += pagesize) {
strcpy(memory + i, "memory"); strcpy(memory + i, "memory");
} }
FILE_LOG(logDEBUG) << "Memory Allocated " << index << ": " << (double)mem_len/(1000.00 * 1000.00) << " Mb"; FILE_LOG(logDEBUG) << "Memory Allocated " << index << ": " << (double)mem_len/(double)(1024 * 1024) << " MB";
{ //push free addresses into fifoFree fifo { //push free addresses into fifoFree fifo
char* buffer = memory; char* buffer = memory;

4
slsReceiverSoftware/src/Implementation.cpp
View File

@ -195,8 +195,8 @@ void Implementation::SetupFifoStructure() {
FILE_LOG(logINFO) << "Memory Allocated Per Fifo: " FILE_LOG(logINFO) << "Memory Allocated Per Fifo: "
<< (double)(((size_t)(generalData->imageSize) + << (double)(((size_t)(generalData->imageSize) +
(size_t)(generalData->fifoBufferHeaderSize)) * (size_t)(generalData->fifoBufferHeaderSize)) *
(size_t)fifoDepth) / (1000.00 * 1000.00) (size_t)fifoDepth) / (double)(1024 * 1024)
<< " Mb"; << " MB";
FILE_LOG(logINFO) << numThreads << " Fifo structure(s) reconstructed"; FILE_LOG(logINFO) << numThreads << " Fifo structure(s) reconstructed";
} }