sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-04-22 23:54:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed config dependency

Browse Source
This commit is contained in:
babic_a
2020-05-20 17:31:00 +02:00
parent 9289be16a2
commit 665602b06c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/include/buffer_config.hpp
+1 -2
View File
@@ -3,7 +3,6 @@
#include <cstddef>
#include <string>
#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.
core-buffer/include/jungfrau.hpp
+3 -2
View File
@@ -2,6 +2,7 @@
#define JUNGFRAU_H
#include <cstdint>
#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;