From 30391a2faf8dd18ca97789484b8e68de7a26e291 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Mon, 25 May 2020 14:23:10 +0200
Subject: [PATCH] veto header size in server using sizeof

---
 .../gotthard2DetectorServer/slsDetectorFunctionList.c         | 4 ++--
 .../gotthard2DetectorServer/slsDetectorServer_defs.h          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
index 9139ee1f7..0790943f8 100644
--- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
@@ -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 + VETO_HEADER_SIZE;
+    int vetopacketsize = vetodatasize + sizeof(veto_header);
 
     // Generate data
     char imageData[imagesize];
@@ -2340,7 +2340,7 @@ void *start_timer(void *arg) {
                     header->bunchId = 0;
                     header->reserved = 0;
                     // fill data
-                    memcpy(packetData2 + VETO_HEADER_SIZE, vetoData,
+                    memcpy(packetData2 + sizeof(veto_header), vetoData,
                            vetodatasize);
                     // send 1 packet = 1 frame
                     sendUDPPacket(1, packetData2, vetopacketsize);
diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
index 09199d818..a21f424bf 100644
--- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
@@ -57,7 +57,6 @@
 #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;