From 0c40d0b4bc645254694fd616334cd331b247c139 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Fri, 19 Jun 2020 16:11:58 +0200
Subject: [PATCH] Extract detector name from provided path

---
 sf-writer/include/JFH5Writer.hpp |  3 ++-
 sf-writer/src/JFH5Writer.cpp     | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/sf-writer/include/JFH5Writer.hpp b/sf-writer/include/JFH5Writer.hpp
index 711b703..afd4a76 100644
--- a/sf-writer/include/JFH5Writer.hpp
+++ b/sf-writer/include/JFH5Writer.hpp
@@ -32,12 +32,13 @@ class JFH5Writer {
                                  const int pulse_id_step);
 
     void write_metadata();
+    std::string get_device_name(const std::string& device);
 
     void close_file();
 
 public:
     JFH5Writer(const std::string& output_file,
-               const std::string& detector_name,
+               const std::string& device,
                const size_t n_modules,
                const uint64_t start_pulse_id,
                const uint64_t stop_pulse_id,
diff --git a/sf-writer/src/JFH5Writer.cpp b/sf-writer/src/JFH5Writer.cpp
index 0f64b4f..2b9b274 100644
--- a/sf-writer/src/JFH5Writer.cpp
+++ b/sf-writer/src/JFH5Writer.cpp
@@ -18,12 +18,12 @@ using namespace writer_config;
 using namespace buffer_config;
 
 JFH5Writer::JFH5Writer(const string& output_file,
-                       const string& detector_name,
+                       const string& device,
                        const size_t n_modules,
                        const uint64_t start_pulse_id,
                        const uint64_t stop_pulse_id,
                        const size_t pulse_id_step) :
-        detector_name_(detector_name),
+        detector_name_(get_device_name(device)),
         n_modules_(n_modules),
         start_pulse_id_(start_pulse_id),
         stop_pulse_id_(stop_pulse_id),
@@ -75,6 +75,16 @@ JFH5Writer::JFH5Writer(const string& output_file,
     b_is_good_frame_ = new uint8_t[n_total_pulses_];
 }
 
+std::string JFH5Writer::get_device_name(const std::string& device)
+{
+    size_t last_separator;
+    if ((last_separator = device.rfind("/")) == string::npos) {
+        return device;
+    }
+
+    return device.substr(last_separator+1);
+}
+
 JFH5Writer::~JFH5Writer()
 {
     close_file();