From 72a9b3bcc991533b02118196528f9eea05d6f24d Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Wed, 27 May 2020 10:27:14 +0200
Subject: [PATCH] Small refactoring

---
 sf-buffer/include/BufferBinaryWriter.hpp |  3 ++-
 sf-buffer/include/BufferH5Writer.hpp     |  5 +++--
 sf-buffer/src/BufferBinaryWriter.cpp     | 13 +++++++++----
 sf-buffer/src/BufferH5Writer.cpp         |  3 ++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/sf-buffer/include/BufferBinaryWriter.hpp b/sf-buffer/include/BufferBinaryWriter.hpp
index 8be8855..e401236 100644
--- a/sf-buffer/include/BufferBinaryWriter.hpp
+++ b/sf-buffer/include/BufferBinaryWriter.hpp
@@ -2,7 +2,8 @@
 #define BINARYWRITER_HPP
 
 #include <string>
-#include "BufferBinaryFormat.hpp"
+
+#include "formats.hpp"
 
 class BufferBinaryWriter {
 
diff --git a/sf-buffer/include/BufferH5Writer.hpp b/sf-buffer/include/BufferH5Writer.hpp
index a4f61b2..922d4df 100644
--- a/sf-buffer/include/BufferH5Writer.hpp
+++ b/sf-buffer/include/BufferH5Writer.hpp
@@ -6,9 +6,10 @@
 #include <string>
 #include <H5Cpp.h>
 #include <memory>
-#include "jungfrau.hpp"
 #include <unordered_map>
-#include <buffer_config.hpp>
+
+#include "jungfrau.hpp"
+#include "buffer_config.hpp"
 
 class BufferH5Writer {
 
diff --git a/sf-buffer/src/BufferBinaryWriter.cpp b/sf-buffer/src/BufferBinaryWriter.cpp
index 7430038..6e189a6 100644
--- a/sf-buffer/src/BufferBinaryWriter.cpp
+++ b/sf-buffer/src/BufferBinaryWriter.cpp
@@ -1,13 +1,15 @@
 #include "BufferBinaryWriter.hpp"
+
 #include <unistd.h>
 #include <iostream>
 #include "date.h"
 #include <cerrno>
 #include <chrono>
 #include <cstring>
-#include <BufferUtils.hpp>
 #include <fcntl.h>
-#include <WriterUtils.hpp>
+
+#include "BufferUtils.hpp"
+#include "WriterUtils.hpp"
 
 using namespace std;
 
@@ -27,7 +29,9 @@ BufferBinaryWriter::~BufferBinaryWriter()
     close_current_file();
 }
 
-void BufferBinaryWriter::write(uint64_t pulse_id, const BufferBinaryFormat* buffer)
+void BufferBinaryWriter::write(
+        uint64_t pulse_id,
+        const BufferBinaryFormat* buffer)
 {
     auto current_frame_file =
             BufferUtils::get_filename(root_folder_, device_name_, pulse_id);
@@ -37,7 +41,8 @@ void BufferBinaryWriter::write(uint64_t pulse_id, const BufferBinaryFormat* buff
     }
 
     size_t n_bytes_offset =
-            BufferUtils::get_file_frame_index(pulse_id) * sizeof(BufferBinaryFormat);
+            BufferUtils::get_file_frame_index(pulse_id) *
+            sizeof(BufferBinaryFormat);
 
     auto lseek_result = lseek(output_file_fd_, n_bytes_offset, SEEK_SET);
     if (lseek_result < 0) {
diff --git a/sf-buffer/src/BufferH5Writer.cpp b/sf-buffer/src/BufferH5Writer.cpp
index ed7ce39..c2706ec 100644
--- a/sf-buffer/src/BufferH5Writer.cpp
+++ b/sf-buffer/src/BufferH5Writer.cpp
@@ -84,7 +84,8 @@ void BufferH5Writer::set_pulse_id(const uint64_t pulse_id)
         if (h5_file_.getId() != -1) {
             auto latest_filename = output_filename_;
             close_file();
-            BufferUtils::update_latest_file(LATEST_filename_, latest_filename);
+            BufferUtils::update_latest_file(
+                    LATEST_filename_, latest_filename);
         }
 
         WriterUtils::create_destination_folder(new_output_filename);