mirror of
https://github.com/paulscherrerinstitute/sf_daq_buffer.git
synced 2026-05-01 08:02:23 +02:00
Rename SFWriter to new standard naming
This commit is contained in:
@@ -15,7 +15,7 @@ struct DetectorFrame
|
||||
bool is_good_frame[core_buffer::WRITER_N_FRAMES_BUFFER];
|
||||
};
|
||||
|
||||
class SFWriter {
|
||||
class WriterH5Writer {
|
||||
|
||||
const size_t n_frames_;
|
||||
const size_t n_modules_;
|
||||
@@ -30,11 +30,11 @@ class SFWriter {
|
||||
H5::DataSet n_received_packets_dataset_;
|
||||
|
||||
public:
|
||||
SFWriter(
|
||||
WriterH5Writer(
|
||||
const std::string& output_file,
|
||||
const size_t n_frames,
|
||||
const size_t n_modules);
|
||||
~SFWriter();
|
||||
~WriterH5Writer();
|
||||
void write(const DetectorFrame* metadata, const char* data);
|
||||
void close_file();
|
||||
};
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <stdexcept>
|
||||
#include <SFWriter.hpp>
|
||||
#include <WriterH5Writer.hpp>
|
||||
#include <jungfrau.hpp>
|
||||
#include "FastQueue.hpp"
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "SFWriter.hpp"
|
||||
#include "WriterH5Writer.hpp"
|
||||
#include <sstream>
|
||||
#include "date.h"
|
||||
|
||||
@@ -10,7 +10,7 @@ extern "C"
|
||||
using namespace std;
|
||||
using namespace core_buffer;
|
||||
|
||||
SFWriter::SFWriter(
|
||||
WriterH5Writer::WriterH5Writer(
|
||||
const string& output_file,
|
||||
const size_t n_frames,
|
||||
const size_t n_modules) :
|
||||
@@ -68,12 +68,12 @@ SFWriter::SFWriter(
|
||||
metadata_dataset_properties);
|
||||
}
|
||||
|
||||
SFWriter::~SFWriter()
|
||||
WriterH5Writer::~WriterH5Writer()
|
||||
{
|
||||
close_file();
|
||||
}
|
||||
|
||||
void SFWriter::close_file()
|
||||
void WriterH5Writer::close_file()
|
||||
{
|
||||
image_dataset_.close();
|
||||
pulse_id_dataset_.close();
|
||||
@@ -84,7 +84,7 @@ void SFWriter::close_file()
|
||||
file_.close();
|
||||
}
|
||||
|
||||
void SFWriter::write(const DetectorFrame* metadata, const char* data) {
|
||||
void WriterH5Writer::write(const DetectorFrame* metadata, const char* data) {
|
||||
auto pulse_id_data = (char*)(metadata->pulse_id);
|
||||
auto frame_index_data = (char*)(metadata->frame_index);
|
||||
auto daq_rec_data = (char*)(metadata->daq_rec);
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <RingBuffer.hpp>
|
||||
#include <thread>
|
||||
#include <chrono>
|
||||
#include "SFWriter.hpp"
|
||||
#include "WriterH5Writer.hpp"
|
||||
|
||||
using namespace std;
|
||||
using namespace core_buffer;
|
||||
@@ -33,7 +33,7 @@ int main (int argc, char *argv[])
|
||||
size_t n_modules = 32;
|
||||
|
||||
size_t n_frames = stop_pulse_id - start_pulse_id;
|
||||
SFWriter writer(output_file, n_frames, n_modules);
|
||||
WriterH5Writer writer(output_file, n_frames, n_modules);
|
||||
|
||||
// TODO: Remove stats trash.
|
||||
int i_write = 0;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "SFWriter.hpp"
|
||||
#include "WriterH5Writer.hpp"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
using namespace core_buffer;
|
||||
@@ -11,7 +11,7 @@ TEST(SFWriter, basic_interaction)
|
||||
auto data = make_unique<char[]>(n_modules*MODULE_N_BYTES);
|
||||
auto metadata = make_shared<DetectorFrame>();
|
||||
|
||||
SFWriter writer("ignore.h5", n_frames, n_modules);
|
||||
WriterH5Writer writer("ignore.h5", n_frames, n_modules);
|
||||
writer.write(metadata.get(), data.get());
|
||||
writer.close_file();
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <jungfrau.hpp>
|
||||
#include <thread>
|
||||
#include <chrono>
|
||||
#include "SFWriter.hpp"
|
||||
#include "WriterH5Writer.hpp"
|
||||
#include <FastQueue.hpp>
|
||||
#include <cstring>
|
||||
#include <zmq.h>
|
||||
|
||||
Reference in New Issue
Block a user