From a45c399edc012968c450f30eeae0b2edb1f47e3c Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Mon, 12 Feb 2018 15:34:10 +0100
Subject: [PATCH] Raw frames dataset name out of format

---
 src/H5Format.cpp          | 3 ++-
 src/H5Format.hpp          | 2 --
 src/ProcessManager.cpp    | 2 +-
 src/config.cpp            | 2 +-
 src/config.hpp            | 2 +-
 src/format/NXmxFormat.cpp | 5 -----
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/H5Format.cpp b/src/H5Format.cpp
index 9f582e0..5362303 100644
--- a/src/H5Format.cpp
+++ b/src/H5Format.cpp
@@ -3,6 +3,7 @@
 #include <stdexcept>
 #include <iostream>
 
+#include "config.hpp"
 #include "H5Format.hpp"
 
 using namespace std;
@@ -329,5 +330,5 @@ void H5FormatUtils::write_format(H5::H5File& file, const H5Format& format, const
     
     write_format_data(file, format_definition, format_values);
 
-    file.move(format.get_raw_frames_dataset_name().c_str(), format.get_frames_dataset_name().c_str());
+    file.move(config::raw_image_dataset_name.c_str(), format.get_frames_dataset_name().c_str());
 }
\ No newline at end of file
diff --git a/src/H5Format.hpp b/src/H5Format.hpp
index 40ec663..9212b50 100644
--- a/src/H5Format.hpp
+++ b/src/H5Format.hpp
@@ -98,8 +98,6 @@ class H5Format
 
         virtual void add_input_values(std::map<std::string, boost::any>& values, 
             const std::map<std::string, boost::any>& input_values) const = 0;
-        
-        virtual std::string get_raw_frames_dataset_name() const = 0;
 
         virtual std::string get_frames_dataset_name() const = 0;
 };
diff --git a/src/ProcessManager.cpp b/src/ProcessManager.cpp
index 758e811..fe1e8df 100644
--- a/src/ProcessManager.cpp
+++ b/src/ProcessManager.cpp
@@ -90,7 +90,7 @@ void ProcessManager::write_h5(WriterManager& manager, const H5Format& format, Ri
     const unordered_map<string, string>& header_values_type)
 {
     H5Writer writer(manager.get_output_file(), 0, config::initial_dataset_size, config::dataset_increase_step);
-    auto raw_frames_dataset_name = format.get_raw_frames_dataset_name();
+    auto raw_frames_dataset_name = config::raw_image_dataset_name;
 
     // Mapping for header values.
     // TODO: This should be moved into future PROTOCOL FORMAT file.
diff --git a/src/config.cpp b/src/config.cpp
index 3f32ed2..56782ee 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -15,7 +15,7 @@ namespace config {
     // Delay before trying again to get data from the ring buffer.
     uint32_t ring_buffer_read_retry_interval = 5;
 
-    std::string raw_dataset_name = "raw_data";
+    std::string raw_image_dataset_name = "raw_data";
     
     // By how much to enlarge a dataset when a resizing is needed.
     hsize_t dataset_increase_step = 1000;
diff --git a/src/config.hpp b/src/config.hpp
index 3ff2c0d..f534373 100644
--- a/src/config.hpp
+++ b/src/config.hpp
@@ -16,7 +16,7 @@ namespace config
 
     extern hsize_t dataset_increase_step;
     extern hsize_t initial_dataset_size;
-    extern std::string raw_dataset_name;
+    extern std::string raw_image_dataset_name;
 
     extern uint32_t parameters_read_retry_interval;
 }
diff --git a/src/format/NXmxFormat.cpp b/src/format/NXmxFormat.cpp
index a1b52f0..7c7f1a8 100644
--- a/src/format/NXmxFormat.cpp
+++ b/src/format/NXmxFormat.cpp
@@ -897,11 +897,6 @@ class NXmxFormat : public H5Format
             }));
         }
 
-
-        string get_raw_frames_dataset_name() const override {
-            return "raw_data";
-        }
-
         string get_frames_dataset_name() const override {
             return "entry/plottable_data/data";
         }