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

small changes for jungfrau, but also for the gui

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-03-03 15:57:48 +01:00
parent 85cc0d8184
commit 50f8366bc2
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/include/GeneralData.h
View File

@ -382,7 +382,7 @@ private:
{
jfrau_packet_header_t* header = (jfrau_packet_header_t*)(packetData);
frameNumber = (uint64_t)(*( (uint32_t*) header->frameNumber));
packetNumber = (uint32_t)(*( (uint8_t*) header->packetNumber));
packetNumber = packetsPerFrame -1 - (uint32_t)(*( (uint8_t*) header->packetNumber));
}
/**
@ -401,7 +401,7 @@ private:
subFrameNumber = -1;
jfrau_packet_header_t* header = (jfrau_packet_header_t*)(packetData);
frameNumber = (uint64_t)(*( (uint32_t*) header->frameNumber));
packetNumber = (uint32_t)(*( (uint8_t*) header->packetNumber));
packetNumber = packetsPerFrame - 1 -(uint32_t)(*( (uint8_t*) header->packetNumber));
bunchId = (*((uint64_t*) header->bunchid));
}

2
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -319,7 +319,7 @@ public:
printf("%d: type: %s\n", index, d["type"].GetString());
#endif
if(d["acqIndex"].GetInt()!=-1){
if(d["acqIndex"].GetUint64()!=-1){
acqIndex = d["acqIndex"].GetUint64();
frameIndex = d["fIndex"].GetUint64();
subframeIndex = d["subfnum"].GetUint();