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

veto header size in server using sizeof

Browse Source
This commit is contained in:
maliakal_d
2020-05-25 14:23:10 +02:00
parent 6bdc506a34
commit 30391a2faf
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -2274,7 +2274,7 @@ void *start_timer(void *arg) {
int datasize = imagesize; int datasize = imagesize;
int packetsize = datasize + sizeof(sls_detector_header); int packetsize = datasize + sizeof(sls_detector_header);
int vetodatasize = VETO_DATA_SIZE; int vetodatasize = VETO_DATA_SIZE;
int vetopacketsize = vetodatasize + VETO_HEADER_SIZE; int vetopacketsize = vetodatasize + sizeof(veto_header);
// Generate data // Generate data
char imageData[imagesize]; char imageData[imagesize];
@ -2340,7 +2340,7 @@ void *start_timer(void *arg) {
header->bunchId = 0; header->bunchId = 0;
header->reserved = 0; header->reserved = 0;
// fill data // fill data
memcpy(packetData2 + VETO_HEADER_SIZE, vetoData, memcpy(packetData2 + sizeof(veto_header), vetoData,
vetodatasize); vetodatasize);
// send 1 packet = 1 frame // send 1 packet = 1 frame
sendUDPPacket(1, packetData2, vetopacketsize); sendUDPPacket(1, packetData2, vetopacketsize);

1
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -57,7 +57,6 @@
#define READOUT_PLL_VCO_FREQ_HZ (866666688) // 866 MHz #define READOUT_PLL_VCO_FREQ_HZ (866666688) // 866 MHz
#define SYSTEM_PLL_VCO_FREQ_HZ (722222224) // 722 MHz #define SYSTEM_PLL_VCO_FREQ_HZ (722222224) // 722 MHz
#define VETO_DATA_SIZE (160) #define VETO_DATA_SIZE (160)
#define VETO_HEADER_SIZE (24)
typedef struct { typedef struct {
uint64_t frameNumber; uint64_t frameNumber;
uint64_t bunchId; uint64_t bunchId;