From fb75986c55f6dae07d12f112209516e55ea4359e Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 16 Jan 2020 16:13:40 +0100 Subject: [PATCH] mythne3: counters fixed --- slsReceiverSoftware/include/GeneralData.h | 5 ++++- slsReceiverSoftware/src/Implementation.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/slsReceiverSoftware/include/GeneralData.h b/slsReceiverSoftware/include/GeneralData.h index 427b2c790..57aae95d2 100755 --- a/slsReceiverSoftware/include/GeneralData.h +++ b/slsReceiverSoftware/include/GeneralData.h @@ -571,12 +571,14 @@ public: } ncounters = n; nPixelsX = NCHAN * ncounters; + FILE_LOG(logINFO) << "nPixelsX: " << nPixelsX; imageSize = nPixelsX * nPixelsY * ((dr > 16) ? 4 : // 32 bit ((dr > 8) ? 2 : // 16 bit ((dr > 4) ? 0.5 : // 4 bit 0.125))); // 1 bit dataSize = imageSize / packetsPerFrame; packetSize = headerSizeinPacket + dataSize; + FILE_LOG(logINFO) << "PacketSize: " << packetSize; } /** @@ -590,7 +592,8 @@ public: ((dr > 4) ? 0.5 : // 4 bit 0.125))); // 1 bit dataSize = imageSize / packetsPerFrame; - packetSize = headerSizeinPacket + dataSize; + packetSize = headerSizeinPacket + dataSize; + FILE_LOG(logINFO) << "PacketSize: " << packetSize; } }; diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index 55e0c4fb4..941bcebfa 100755 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -1298,7 +1298,7 @@ void Implementation::setNumberofCounters(const int i) { numberOfCounters = i; if (myDetectorType == MYTHEN3) { - generalData->SetDynamicRange(i, tengigaEnable); + generalData->SetNumberofCounters(i, dynamicRange); // to update npixelsx, npixelsy in file writer for (const auto &it : dataProcessor) it->SetPixelDimension();