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

veto header smaller size

Browse Source
This commit is contained in:
maliakal_d
2020-05-25 12:20:40 +02:00
parent 9592d1760f
commit 6bdc506a34
4 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -2274,7 +2274,7 @@ void *start_timer(void *arg) {
int datasize = imagesize;
int packetsize = datasize + sizeof(sls_detector_header);
int vetodatasize = VETO_DATA_SIZE;
int vetopacketsize = vetodatasize + sizeof(sls_detector_header);
int vetopacketsize = vetodatasize + VETO_HEADER_SIZE;
// Generate data
char imageData[imagesize];
@ -2331,21 +2331,16 @@ void *start_timer(void *arg) {
sendUDPPacket(0, packetData, packetsize);
// second interface (veto)
char packetData2[packetsize];
memset(packetData2, 0, packetsize);
char packetData2[vetopacketsize];
memset(packetData2, 0, vetopacketsize);
if (numInterfaces == 2) {
// set header
sls_detector_header *header =
(sls_detector_header *)(packetData2);
header->detType = (uint16_t)myDetectorType;
header->version = SLS_DETECTOR_HEADER_VERSION - 1;
veto_header *header = (veto_header *)(packetData2);
header->frameNumber = frameHeaderNr;
header->packetNumber = 0;
header->modId = 0;
header->row = detPos[X];
header->column = detPos[Y];
header->bunchId = 0;
header->reserved = 0;
// fill data
memcpy(packetData2 + sizeof(sls_detector_header), vetoData,
memcpy(packetData2 + VETO_HEADER_SIZE, vetoData,
vetodatasize);
// send 1 packet = 1 frame
sendUDPPacket(1, packetData2, vetopacketsize);

7
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -57,6 +57,13 @@
#define READOUT_PLL_VCO_FREQ_HZ (866666688) // 866 MHz
#define SYSTEM_PLL_VCO_FREQ_HZ (722222224) // 722 MHz
#define VETO_DATA_SIZE (160)
#define VETO_HEADER_SIZE (24)
typedef struct {
uint64_t frameNumber;
uint64_t bunchId;
uint64_t reserved;
} veto_header;
/** Other Definitions */
#define BIT16_MASK (0xFFFF)