From 09900876b2edeb396c9ba1355406ad90dfc41166 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Tue, 21 Apr 2020 12:33:24 +0200
Subject: [PATCH] Calculate device name internally

---
 sf-writer/BufferMultiReader.cpp | 11 ++++++++---
 sf-writer/BufferMultiReader.hpp |  5 +----
 sf-writer/sf_h5_writer.cpp      |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sf-writer/BufferMultiReader.cpp b/sf-writer/BufferMultiReader.cpp
index cddb86f..fa06e72 100644
--- a/sf-writer/BufferMultiReader.cpp
+++ b/sf-writer/BufferMultiReader.cpp
@@ -1,13 +1,12 @@
 #include <ZmqRecvModule.hpp>
 #include "BufferMultiReader.hpp"
 #include "BufferUtils.hpp"
+#include <sstream>
 
 using namespace std;
 
 BufferMultiReader::BufferMultiReader(
-        const std::string& device_name,
         const std::string& root_folder) :
-            device_name_(device_name),
             root_folder_(root_folder),
             is_running_(true),
             pulse_id_(0)
@@ -62,6 +61,12 @@ UdpFrameMetadata BufferMultiReader::load_frame_to_buffer(
 
 void BufferMultiReader::read_thread(uint8_t module_number)
 {
+    stringstream name;
+    name << "M";
+    if (module_number < 10) name << "0";
+    name << module_number;
+
+    string device_name = name.str();
     size_t buffer_offset = 512*1024*module_number;
 
     string current_filename = "";
@@ -81,7 +86,7 @@ void BufferMultiReader::read_thread(uint8_t module_number)
         last_pulse_id = pulse_id_;
 
         auto pulse_filename = BufferUtils::get_filename(
-                root_folder_, device_name_, last_pulse_id);
+                root_folder_, device_name, last_pulse_id);
 
         if (pulse_filename != current_filename) {
 
diff --git a/sf-writer/BufferMultiReader.hpp b/sf-writer/BufferMultiReader.hpp
index 60bc91d..ada9db7 100644
--- a/sf-writer/BufferMultiReader.hpp
+++ b/sf-writer/BufferMultiReader.hpp
@@ -6,7 +6,6 @@
 
 class BufferMultiReader
 {
-    const std::string device_name_;
     const std::string root_folder_;
     std::atomic_bool is_running_;
     uint16_t* frame_buffer_;
@@ -20,9 +19,7 @@ protected:
     void read_thread(uint8_t module_number);
 
 public:
-    BufferMultiReader(
-            const std::string& device_name,
-            const std::string& root_folder);
+    BufferMultiReader(const std::string& root_folder);
 
     virtual ~BufferMultiReader();
 
diff --git a/sf-writer/sf_h5_writer.cpp b/sf-writer/sf_h5_writer.cpp
index b501c98..0a0f1dc 100644
--- a/sf-writer/sf_h5_writer.cpp
+++ b/sf-writer/sf_h5_writer.cpp
@@ -31,7 +31,7 @@ int main (int argc, char *argv[])
     uint64_t start_pulse_id = (uint64_t) atoi(argv[4]);
     uint64_t stop_pulse_id = (uint64_t) atoi(argv[5]);
 
-    BufferMultiReader reader(device_name, root_folder);
+    BufferMultiReader reader(root_folder);
     UdpFrameMetadata metadata;
     char* frame_buffer = reader.get_buffer();