From bf1a5a928bc9fc6513b6bbd1074add6d4b5a0121 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Fri, 4 Sep 2020 12:54:41 +0200
Subject: [PATCH] Remove module id from RamBuffer

Module id is already present in the buffer package.
---
 core-buffer/include/RamBuffer.hpp | 2 --
 core-buffer/src/RamBuffer.cpp     | 8 +++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/core-buffer/include/RamBuffer.hpp b/core-buffer/include/RamBuffer.hpp
index d871ac6..d6c841a 100644
--- a/core-buffer/include/RamBuffer.hpp
+++ b/core-buffer/include/RamBuffer.hpp
@@ -7,7 +7,6 @@
 class RamBuffer {
     const std::string detector_name_;
     const int n_modules_;
-    const int module_n_;
     const int n_slots_;
 
     const size_t meta_size_;
@@ -23,7 +22,6 @@ class RamBuffer {
 public:
     RamBuffer(const std::string& detector_name,
               const int n_modules,
-              const int module_n=0,
               const int n_slots=RAM_BUFFER_N_SLOTS);
     ~RamBuffer();
 
diff --git a/core-buffer/src/RamBuffer.cpp b/core-buffer/src/RamBuffer.cpp
index 376dfaa..106c61a 100644
--- a/core-buffer/src/RamBuffer.cpp
+++ b/core-buffer/src/RamBuffer.cpp
@@ -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);