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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
Erik Frojdh 2020-01-16 16:57:12 +01:00
commit 66b837eb59
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsReceiverSoftware/include/GeneralData.h
View File

@ -571,12 +571,14 @@ public:
} }
ncounters = n; ncounters = n;
nPixelsX = NCHAN * ncounters; nPixelsX = NCHAN * ncounters;
FILE_LOG(logINFO) << "nPixelsX: " << nPixelsX;
imageSize = nPixelsX * nPixelsY * ((dr > 16) ? 4 : // 32 bit imageSize = nPixelsX * nPixelsY * ((dr > 16) ? 4 : // 32 bit
((dr > 8) ? 2 : // 16 bit ((dr > 8) ? 2 : // 16 bit
((dr > 4) ? 0.5 : // 4 bit ((dr > 4) ? 0.5 : // 4 bit
0.125))); // 1 bit 0.125))); // 1 bit
dataSize = imageSize / packetsPerFrame; dataSize = imageSize / packetsPerFrame;
packetSize = headerSizeinPacket + dataSize; packetSize = headerSizeinPacket + dataSize;
FILE_LOG(logINFO) << "PacketSize: " << packetSize;
} }
/** /**
@ -591,6 +593,7 @@ public:
0.125))); // 1 bit 0.125))); // 1 bit
dataSize = imageSize / packetsPerFrame; dataSize = imageSize / packetsPerFrame;
packetSize = headerSizeinPacket + dataSize; packetSize = headerSizeinPacket + dataSize;
FILE_LOG(logINFO) << "PacketSize: " << packetSize;
} }
}; };

2
slsReceiverSoftware/src/Implementation.cpp
View File

@ -1298,7 +1298,7 @@ void Implementation::setNumberofCounters(const int i) {
numberOfCounters = i; numberOfCounters = i;
if (myDetectorType == MYTHEN3) { if (myDetectorType == MYTHEN3) {
generalData->SetDynamicRange(i, tengigaEnable); generalData->SetNumberofCounters(i, dynamicRange);
// to update npixelsx, npixelsy in file writer // to update npixelsx, npixelsy in file writer
for (const auto &it : dataProcessor) for (const auto &it : dataProcessor)
it->SetPixelDimension(); it->SetPixelDimension();