detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +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) { if (nPixelsX == 1280) {
subFrameNumber = -1; subFrameNumber = -1;
bunchId = -1; bunchId = -1;
frameNumber = ((uint32_t)(*((uint32_t*)(packetData)))); frameNumber = *reinterpret_cast<uint32_t*>(packetData);
if (oddStartingPacket) if (oddStartingPacket)
frameNumber++; frameNumber++;
packetNumber = frameNumber&packetIndexMask; packetNumber = frameNumber&packetIndexMask;
@ -309,8 +309,8 @@ private:
} else { } else {
subFrameNumber = -1; subFrameNumber = -1;
bunchId = -1; bunchId = -1;
frameNumber = ((uint32_t)(*((uint32_t*)(packetData)))); frameNumber = *reinterpret_cast<uint32_t *>(packetData);
packetNumber = 0; packetNumber = 0;
} }
} }
@ -673,7 +673,7 @@ public:
void GetHeaderInfo(int index, char* packetData, uint32_t dynamicRange, bool oddStartingPacket, void GetHeaderInfo(int index, char* packetData, uint32_t dynamicRange, bool oddStartingPacket,
uint64_t& frameNumber, uint32_t& packetNumber, uint32_t& subFrameNumber, uint64_t& bunchId) const { uint64_t& frameNumber, uint32_t& packetNumber, uint32_t& subFrameNumber, uint64_t& bunchId) const {
subFrameNumber = -1; subFrameNumber = -1;
jfrauctb_packet_header* header = (jfrauctb_packet_header*)(packetData); auto header = reinterpret_cast<jfrauctb_packet_header*>(packetData);
frameNumber = (header->packetFrameNumber >> 8) & frameIndexMask; frameNumber = (header->packetFrameNumber >> 8) & frameIndexMask;
packetNumber = header->packetFrameNumber & 0xFF; packetNumber = header->packetFrameNumber & 0xFF;
bunchId = header->bunchid; bunchId = header->bunchid;
@ -723,4 +723,4 @@ public:
;

32
slsReceiverSoftware/tests/test-GeneralData.cpp
View File

@ -25,8 +25,8 @@ TEST_CASE("Parse jungfrauctb header", "[receiver]") {
unsigned char packetNumber[1]; unsigned char packetNumber[1];
unsigned char frameNumber[3]; unsigned char frameNumber[3];
unsigned char bunchid[8]; unsigned char bunchid[8];
unsigned char data[1024]; unsigned char data[UDP_PACKET_DATA_BYTES];
}; } __attribute__((packed));
MoenchData data; MoenchData data;
// GetHeaderInfo(int index, char *packetData, uint32_t dynamicRange, // GetHeaderInfo(int index, char *packetData, uint32_t dynamicRange,
@ -65,4 +65,32 @@ TEST_CASE("Parse jungfrauctb header", "[receiver]") {
CHECK(packetNumber == 53); CHECK(packetNumber == 53);
CHECK(frameNumber == 0x5b0f20); CHECK(frameNumber == 0x5b0f20);
CHECK(bunchId == 0xf012fb20010f195b); CHECK(bunchId == 0xf012fb20010f195b);
CHECK(subFrameNumber == -1);
} }
TEST_CASE("Parse header gotthard data", "[receiver]") {
GotthardData data;
struct packet {
uint32_t frameNumber;
unsigned char data[GOTTHARD_PACKET_SIZE];
} __attribute__((packed));
packet test_packet;
test_packet.frameNumber = 25698u;
int index = 0;
char *packetData = reinterpret_cast<char *>(&test_packet);
uint32_t dynamicRange{0};
bool oddStartingPacket{0};
uint64_t frameNumber{0};
uint32_t packetNumber{0};
uint32_t subFrameNumber{0};
uint64_t bunchId{0};
data.GetHeaderInfo(index, packetData, dynamicRange, oddStartingPacket,
frameNumber, packetNumber, subFrameNumber, bunchId);
CHECK(frameNumber == test_packet.frameNumber/2);
CHECK(subFrameNumber == -1);
CHECK(bunchId == -1);
}