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

Remove module id from RamBuffer

Browse Source 
Module id is already present in the buffer package.
This commit is contained in:
babic_a
2020-09-04 12:54:41 +02:00
parent 352aefef26
commit bf1a5a928b
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/src/RamBuffer.cpp
+3 -5
View File
@@ -12,11 +12,9 @@ using namespace buffer_config;
RamBuffer::RamBuffer(
const string &detector_name,
const int n_modules,
const int module_n,
const int n_slots) :
detector_name_(detector_name),
n_modules_(n_modules),
module_n_(module_n),
n_slots_(n_slots),
meta_size_(sizeof(ModuleFrame) * n_modules_),
image_size_(MODULE_N_BYTES * n_modules_),
@@ -53,15 +51,15 @@ void RamBuffer::write_frame(
const ModuleFrame *src_meta,
const char *src_data) const
{
const size_t slot_n = src_meta->pulse_id % n_slots_;
const int slot_n = src_meta->pulse_id % n_slots_;
ModuleFrame *dst_meta = meta_buffer_ +
(meta_size_ * slot_n) +
module_n_;
src_meta->module_id;
char *dst_data = image_buffer_ +
(image_size_ * slot_n) +
(MODULE_N_BYTES * module_n_);
(MODULE_N_BYTES * src_meta->module_id);
memcpy(dst_meta, src_meta, sizeof(ModuleFrame));
memcpy(dst_data, src_data, MODULE_N_BYTES);