From 665602b06cd862d0ee7211aaac6cfbc3a4f4f7ba Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Wed, 20 May 2020 17:31:00 +0200 Subject: [PATCH] Fixed config dependency --- core-buffer/include/buffer_config.hpp | 3 +-- core-buffer/include/jungfrau.hpp | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core-buffer/include/buffer_config.hpp b/core-buffer/include/buffer_config.hpp index 2e913b4..0d23325 100644 --- a/core-buffer/include/buffer_config.hpp +++ b/core-buffer/include/buffer_config.hpp @@ -3,7 +3,6 @@ #include #include -#include "jungfrau.hpp" namespace core_buffer { @@ -32,7 +31,7 @@ namespace core_buffer { const int BUFFER_UDP_RCVBUF_N_SLOTS = 100; // +1 for packet headers. const int BUFFER_UDP_RCVBUF_BYTES = - (JF_BYTES_PER_FRAME * BUFFER_UDP_RCVBUF_N_SLOTS); + (128 * BUFFER_UDP_RCVBUF_N_SLOTS); // Microseconds timeout for UDP recv. const int BUFFER_UDP_US_TIMEOUT = 2 * 1000; // HWM for live stream from buffer. diff --git a/core-buffer/include/jungfrau.hpp b/core-buffer/include/jungfrau.hpp index 9a60a02..9ae689b 100644 --- a/core-buffer/include/jungfrau.hpp +++ b/core-buffer/include/jungfrau.hpp @@ -2,6 +2,7 @@ #define JUNGFRAU_H #include +#include "buffer_config.hpp" #define JUNGFRAU_N_MODULES 32 #define JUNGFRAU_BYTES_PER_PACKET 8246 @@ -10,7 +11,7 @@ #define JUNGFRAU_DATA_BYTES_PER_FRAME 1048576 #define JF_BYTES_PER_FRAME (8246 * 128) -#include "buffer_config.hpp" + // 6 bytes + 48 bytes + 8192 bytes = 8246 bytes #pragma pack(push) @@ -56,7 +57,7 @@ struct ReplayModuleFrameBuffer { uint64_t pulse_id[core_buffer::REPLAY_READ_BUFFER_SIZE]; uint64_t frame_index[core_buffer::REPLAY_READ_BUFFER_SIZE]; uint64_t daq_rec[core_buffer::REPLAY_READ_BUFFER_SIZE]; - uint64_t n_received_packets[core_buffer::EPLAY_READ_BUFFER_SIZE]; + uint64_t n_received_packets[core_buffer::REPLAY_READ_BUFFER_SIZE]; bool is_frame_present[core_buffer::REPLAY_READ_BUFFER_SIZE]; bool is_good_frame[core_buffer::REPLAY_READ_BUFFER_SIZE]; uint16_t module_id;