From 8256b7ba849d8965fd804b4916ac5fb6eaf141c3 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 18 Apr 2019 11:16:02 +0200 Subject: [PATCH 1/2] eiger receiver fix: setting eth2 as well for eiger --- slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index a64bc9d3b..d025ce737 100755 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -760,7 +760,9 @@ int slsReceiverTCPIPInterface::setup_udp(){ FILE_LOG(logERROR) << mess; } receiver->setEthernetInterface(eth); - + if (myDetectorType == EIGER) { + receiver->setEthernetInterface2(eth); + } //get mac address if (ret != FAIL) { temp = genericSocket::nameToMac(eth); From ff4ce48e5d10040f78a3e0a0ed4bc7f46709dadd Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 18 Apr 2019 11:35:08 +0200 Subject: [PATCH 2/2] receiver memory alignment: all data and header is a multiple of 64 bit, just the fifo header size needed to be 8 --- slsReceiverSoftware/include/receiver_defs.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/slsReceiverSoftware/include/receiver_defs.h b/slsReceiverSoftware/include/receiver_defs.h index 2fabca0bd..bab8edfda 100755 --- a/slsReceiverSoftware/include/receiver_defs.h +++ b/slsReceiverSoftware/include/receiver_defs.h @@ -21,7 +21,9 @@ #define FILE_BUFFER_SIZE (16*1024*1024) //16mb //fifo -#define FIFO_HEADER_NUMBYTES 4 +#define FIFO_HEADER_NUMBYTES 8 +#define FIFO_DATASIZE_NUMBYTES 4 +#define FIFO_PADDING_NUMBYTES 4 // for 8 byte alignment due to sls_receiver_header structure //hdf5