From 299e61f569e97165a8041831743115b63612bb56 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Tue, 26 May 2020 19:34:54 +0200
Subject: [PATCH] Rename class to reflect better its role

---
 .../include/{WriterH5Writer.hpp => JFH5Writer.hpp}     | 10 +++++-----
 sf-writer/include/WriterZmqReceiver.hpp                |  2 +-
 sf-writer/src/{WriterH5Writer.cpp => JFH5Writer.cpp}   | 10 +++++-----
 sf-writer/src/main.cpp                                 |  4 ++--
 sf-writer/test/manual/test_sf_writer_recv.cpp          |  2 +-
 sf-writer/test/test_WriterH5Writer.cpp                 |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename sf-writer/include/{WriterH5Writer.hpp => JFH5Writer.hpp} (75%)
 rename sf-writer/src/{WriterH5Writer.cpp => JFH5Writer.cpp} (96%)

diff --git a/sf-writer/include/WriterH5Writer.hpp b/sf-writer/include/JFH5Writer.hpp
similarity index 75%
rename from sf-writer/include/WriterH5Writer.hpp
rename to sf-writer/include/JFH5Writer.hpp
index d1983d0..d4cdb59 100644
--- a/sf-writer/include/WriterH5Writer.hpp
+++ b/sf-writer/include/JFH5Writer.hpp
@@ -7,7 +7,7 @@
 #include "buffer_config.hpp"
 #include "formats.hpp"
 
-class WriterH5Writer {
+class JFH5Writer {
 
     const size_t n_frames_;
     const size_t n_modules_;
@@ -23,10 +23,10 @@ class WriterH5Writer {
 
 
 public:
-    WriterH5Writer(const std::string& output_file,
-                   const size_t n_frames,
-                   const size_t n_modules);
-    ~WriterH5Writer();
+    JFH5Writer(const std::string& output_file,
+               const size_t n_frames,
+               const size_t n_modules);
+    ~JFH5Writer();
     void write(const ImageMetadataBuffer* metadata, const char* data);
     void close_file();
 };
diff --git a/sf-writer/include/WriterZmqReceiver.hpp b/sf-writer/include/WriterZmqReceiver.hpp
index b02f9e0..c66ba91 100644
--- a/sf-writer/include/WriterZmqReceiver.hpp
+++ b/sf-writer/include/WriterZmqReceiver.hpp
@@ -2,7 +2,7 @@
 #define SF_DAQ_BUFFER_WRITERZMQRECEIVER_HPP
 
 #include <string>
-#include "WriterH5Writer.hpp"
+#include "JFH5Writer.hpp"
 #include <vector>
 #include <jungfrau.hpp>
 
diff --git a/sf-writer/src/WriterH5Writer.cpp b/sf-writer/src/JFH5Writer.cpp
similarity index 96%
rename from sf-writer/src/WriterH5Writer.cpp
rename to sf-writer/src/JFH5Writer.cpp
index 0d921c0..94d89fe 100644
--- a/sf-writer/src/WriterH5Writer.cpp
+++ b/sf-writer/src/JFH5Writer.cpp
@@ -1,4 +1,4 @@
-#include "WriterH5Writer.hpp"
+#include "JFH5Writer.hpp"
 #include <sstream>
 
 
@@ -11,7 +11,7 @@
 using namespace std;
 using namespace core_buffer;
 
-WriterH5Writer::WriterH5Writer(
+JFH5Writer::JFH5Writer(
         const string& output_file,
         const size_t n_frames,
         const size_t n_modules) :
@@ -90,12 +90,12 @@ WriterH5Writer::WriterH5Writer(
 
 }
 
-WriterH5Writer::~WriterH5Writer()
+JFH5Writer::~JFH5Writer()
 {
     close_file();
 }
 
-void WriterH5Writer::close_file()
+void JFH5Writer::close_file()
 {
     image_dataset_.close();
     pulse_id_dataset_.close();
@@ -106,7 +106,7 @@ void WriterH5Writer::close_file()
     file_.close();
 }
 
-void WriterH5Writer::write(
+void JFH5Writer::write(
         const ImageMetadataBuffer* metadata, const char* data)
 {
     auto n_images_in_buffer = metadata->n_images;
diff --git a/sf-writer/src/main.cpp b/sf-writer/src/main.cpp
index 2a3774f..fda91ff 100644
--- a/sf-writer/src/main.cpp
+++ b/sf-writer/src/main.cpp
@@ -6,7 +6,7 @@
 #include <jungfrau.hpp>
 #include <thread>
 #include <chrono>
-#include "WriterH5Writer.hpp"
+#include "JFH5Writer.hpp"
 #include <FastQueue.hpp>
 #include <cstring>
 #include "date.h"
@@ -97,7 +97,7 @@ int main (int argc, char *argv[])
                                  ref(queue), start_pulse_id, stop_pulse_id);
 
     size_t n_frames = stop_pulse_id - start_pulse_id + 1;
-    WriterH5Writer writer(output_file, n_frames, n_modules);
+    JFH5Writer writer(output_file, n_frames, n_modules);
 
     auto current_pulse_id = start_pulse_id;
     // "<= stop_pulse_id" because we include the last pulse_id.
diff --git a/sf-writer/test/manual/test_sf_writer_recv.cpp b/sf-writer/test/manual/test_sf_writer_recv.cpp
index 4f2e463..9a505d8 100644
--- a/sf-writer/test/manual/test_sf_writer_recv.cpp
+++ b/sf-writer/test/manual/test_sf_writer_recv.cpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <thread>
 #include <chrono>
-#include "WriterH5Writer.hpp"
+#include "JFH5Writer.hpp"
 #include <FastQueue.hpp>
 #include <cstring>
 #include "date.h"
diff --git a/sf-writer/test/test_WriterH5Writer.cpp b/sf-writer/test/test_WriterH5Writer.cpp
index fd3f91c..e5236f9 100644
--- a/sf-writer/test/test_WriterH5Writer.cpp
+++ b/sf-writer/test/test_WriterH5Writer.cpp
@@ -1,5 +1,5 @@
 
-#include "WriterH5Writer.hpp"
+#include "JFH5Writer.hpp"
 #include "gtest/gtest.h"
 #include "bitshuffle/bitshuffle.h"
 
@@ -18,7 +18,7 @@ TEST(WriterH5Writer, basic_interaction)
     metadata->data_n_bytes[0] = 500;
     metadata->n_pulses_in_buffer = 1;
 
-    WriterH5Writer writer("ignore.h5", n_frames, n_modules);
+    JFH5Writer writer("ignore.h5", n_frames, n_modules);
     writer.write(metadata.get(), data.get());
     writer.close_file();
 }