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

gotthard2 new firmware veto header reduced to 16 (frames, bunchid)

Browse Source
This commit is contained in:
maliakal_d 2020-05-28 12:44:03 +02:00
parent e884836f5c
commit 15eea51f12
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -2364,7 +2364,6 @@ void *start_timer(void *arg) {
veto_header *header = (veto_header *)(packetData2); veto_header *header = (veto_header *)(packetData2);
header->frameNumber = frameHeaderNr; header->frameNumber = frameHeaderNr;
header->bunchId = 0; header->bunchId = 0;
header->reserved = 0;
// fill data // fill data
memcpy(packetData2 + sizeof(veto_header), vetoData, memcpy(packetData2 + sizeof(veto_header), vetoData,
vetodatasize); vetodatasize);

1
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -60,7 +60,6 @@
typedef struct { typedef struct {
uint64_t frameNumber; uint64_t frameNumber;
uint64_t bunchId; uint64_t bunchId;
uint64_t reserved;
} veto_header; } veto_header;
/** Other Definitions */ /** Other Definitions */

4
slsReceiverSoftware/src/GeneralData.h
View File

@ -495,9 +495,9 @@ class Gotthard2Data : public GeneralData {
standardheader = true; standardheader = true;
defaultUdpSocketBufferSize = (1000 * 1024 * 1024); defaultUdpSocketBufferSize = (1000 * 1024 * 1024);
vetoDataSize = 160; vetoDataSize = 160;
vetoPacketSize = headerSizeinPacket + vetoDataSize;
vetoImageSize = vetoDataSize * packetsPerFrame; vetoImageSize = vetoDataSize * packetsPerFrame;
vetoHsize = 24; vetoHsize = 16;
vetoPacketSize = vetoHsize + vetoDataSize;
}; };
/** /**