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

enable lto

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-08 14:57:10 +02:00
parent fad308754b
commit 39221f1230
5 changed files with 67 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/include/GeneralData.h
View File

@ -10,7 +10,7 @@
#include "sls_detector_defs.h"
#include "receiver_defs.h"
#include "logger.h"
#include <math.h> //ceil
#include <cmath> //ceil
#include <vector>
@ -706,7 +706,7 @@ public:
dataSize = 8192;
packetSize = headerSizeinPacket + dataSize;
imageSize = nPixelsX * nPixelsY * 2;
packetsPerFrame = ceil((double)imageSize / (double)packetSize);
packetsPerFrame = (imageSize + packetSize - 1) / packetSize;
standardheader = false;
}
// 1g udp (via fifo readout)
@ -715,8 +715,8 @@ public:
dataSize = UDP_PACKET_DATA_BYTES;
packetSize = headerSizeinPacket + dataSize;
imageSize = nPixelsX * nPixelsY * 2;
packetsPerFrame = ceil((double)imageSize / (double)UDP_PACKET_DATA_BYTES);
standardheader = true;
packetsPerFrame = (imageSize + UDP_PACKET_DATA_BYTES - 1) / UDP_PACKET_DATA_BYTES;
standardheader = true;
}
}
};

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

@ -11,14 +11,6 @@
TEST_CASE("Parse jungfrauctb header", "[receiver]") {
// typedef struct {
// unsigned char emptyHeader[6];
// unsigned char reserved[4];
// unsigned char packetNumber[1];
// unsigned char frameNumber[3];
// unsigned char bunchid[8];
// } jfrauctb_packet_header_t;
struct packet {
unsigned char emptyHeader[6];
unsigned char reserved[4];
@ -29,26 +21,21 @@ TEST_CASE("Parse jungfrauctb header", "[receiver]") {
} __attribute__((packed));
MoenchData data;
// GetHeaderInfo(int index, char *packetData, uint32_t dynamicRange,
// bool oddStartingPacket, uint64_t &frameNumber,
// uint32_t &packetNumber, uint32_t &subFrameNumber,
// uint64_t &bunchId)
packet test_packet;
test_packet.packetNumber[0] = (unsigned char)53;
test_packet.frameNumber[0] = (unsigned char)32;
test_packet.frameNumber[1] = (unsigned char)15;
test_packet.frameNumber[2] = (unsigned char)91;
test_packet.packetNumber[0] = 53u;
test_packet.frameNumber[0] = 32u;
test_packet.frameNumber[1] = 15u;
test_packet.frameNumber[2] = 91u;
test_packet.bunchid[0] = (unsigned char)91;
test_packet.bunchid[1] = (unsigned char)25;
test_packet.bunchid[2] = (unsigned char)15;
test_packet.bunchid[3] = (unsigned char)1;
test_packet.bunchid[4] = (unsigned char)32;
test_packet.bunchid[5] = (unsigned char)251;
test_packet.bunchid[6] = (unsigned char)18;
test_packet.bunchid[7] = (unsigned char)240;
test_packet.bunchid[0] = 91u;
test_packet.bunchid[1] = 25u;
test_packet.bunchid[2] = 15u;
test_packet.bunchid[3] = 1u;
test_packet.bunchid[4] = 32u;
test_packet.bunchid[5] = 251u;
test_packet.bunchid[6] = 18u;
test_packet.bunchid[7] = 240u;
int index = 0;
char *packetData = reinterpret_cast<char *>(&test_packet);