From 4889256166e99110789bfa52a92c1e370e1bb37a Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Wed, 26 Sep 2018 15:03:54 +0200
Subject: [PATCH] Added back the dataset name

---
 csaxs/CsaxsFormat.cpp     | 14 +++++++++++---
 csaxs/csaxs_h5_writer.cpp |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/csaxs/CsaxsFormat.cpp b/csaxs/CsaxsFormat.cpp
index 7cfaf3e..d9d06a3 100644
--- a/csaxs/CsaxsFormat.cpp
+++ b/csaxs/CsaxsFormat.cpp
@@ -17,16 +17,24 @@ class CsaxsFormat : public H5Format
     public:
         ~CsaxsFormat(){};
 
-        CsaxsFormat()
+        CsaxsFormat(const string& dataset_name)
         {
            
             // After format has been writen, where to move the raw datasets.
-            dataset_move_mapping.reset(new std::unordered_map<string, string>());
+            dataset_move_mapping.reset(new std::unordered_map<string, string>(
+            {
+                {config::raw_image_dataset_name, "data/" + dataset_name + "/data"},
+            }));
 
             input_value_type.reset(new unordered_map<string, DATA_TYPE>());
+
             // Definition of the file format.
             file_format.reset(
-            new h5_parent("", EMPTY_ROOT, {}));
+            new h5_parent("", EMPTY_ROOT, {
+                s_ptr(new h5_group("data", {
+                    s_ptr(new h5_group(dataset_name, {}))
+                }))
+            }));
         }
 
         const h5_parent& get_format_definition() const override
diff --git a/csaxs/csaxs_h5_writer.cpp b/csaxs/csaxs_h5_writer.cpp
index ecf3300..6a52b8d 100644
--- a/csaxs/csaxs_h5_writer.cpp
+++ b/csaxs/csaxs_h5_writer.cpp
@@ -40,7 +40,7 @@ int main (int argc, char *argv[])
 
     auto header_values = shared_ptr<unordered_map<string, HeaderDataType>>();
 
-    CsaxsFormat format();
+    CsaxsFormat format("data");
 
     WriterManager writer_manager(format.get_input_value_type(), output_file, n_frames);
     ZmqReceiver receiver(connect_address, config::zmq_n_io_threads, config::zmq_receive_timeout, header_values);