Rename class to reflect better its role

This commit is contained in:
2020-05-26 19:34:54 +02:00
parent 5047d00ae3
commit 299e61f569
6 changed files with 16 additions and 16 deletions
@@ -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();
};
+1 -1
View File
@@ -2,7 +2,7 @@
#define SF_DAQ_BUFFER_WRITERZMQRECEIVER_HPP
#include <string>
#include "WriterH5Writer.hpp"
#include "JFH5Writer.hpp"
#include <vector>
#include <jungfrau.hpp>
@@ -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;
+2 -2
View File
@@ -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.
@@ -4,7 +4,7 @@
#include <string>
#include <thread>
#include <chrono>
#include "WriterH5Writer.hpp"
#include "JFH5Writer.hpp"
#include <FastQueue.hpp>
#include <cstring>
#include "date.h"
+2 -2
View File
@@ -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();
}