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

cleaning up

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-03 18:41:21 +02:00
parent 0270e18882
commit 69a11f8950
2 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/include/GeneralData.h
View File

@ -301,7 +301,7 @@ private:
if (nPixelsX == 1280) {
subFrameNumber = -1;
bunchId = -1;
frameNumber = ((uint32_t)(*((uint32_t*)(packetData))));
frameNumber = *reinterpret_cast<uint32_t*>(packetData);
if (oddStartingPacket)
frameNumber++;
packetNumber = frameNumber&packetIndexMask;
@ -309,8 +309,8 @@ private:
} else {
subFrameNumber = -1;
bunchId = -1;
frameNumber = ((uint32_t)(*((uint32_t*)(packetData))));
packetNumber = 0;
frameNumber = *reinterpret_cast<uint32_t *>(packetData);
packetNumber = 0;
}
}
@ -673,7 +673,7 @@ public:
void GetHeaderInfo(int index, char* packetData, uint32_t dynamicRange, bool oddStartingPacket,
uint64_t& frameNumber, uint32_t& packetNumber, uint32_t& subFrameNumber, uint64_t& bunchId) const {
subFrameNumber = -1;
jfrauctb_packet_header* header = (jfrauctb_packet_header*)(packetData);
auto header = reinterpret_cast<jfrauctb_packet_header*>(packetData);
frameNumber = (header->packetFrameNumber >> 8) & frameIndexMask;
packetNumber = header->packetFrameNumber & 0xFF;
bunchId = header->bunchid;
@ -723,4 +723,4 @@ public:
;