From b94390ec5a2923e644a52b1b0d7b67da0e95e15c Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Tue, 21 Apr 2020 20:27:15 +0200 Subject: [PATCH] Adjust writer to new buffer --- sf-writer/sf_h5_writer.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/sf-writer/sf_h5_writer.cpp b/sf-writer/sf_h5_writer.cpp index 126d816..f2ec7ee 100644 --- a/sf-writer/sf_h5_writer.cpp +++ b/sf-writer/sf_h5_writer.cpp @@ -2,7 +2,9 @@ #include #include #include +#include #include "BufferMultiReader.hpp" +#include #include "config.hpp" #include "SfFormat.cpp" @@ -30,21 +32,6 @@ int main (int argc, char *argv[]) uint64_t start_pulse_id = (uint64_t) atoll(argv[3]); uint64_t stop_pulse_id = (uint64_t) atoll(argv[4]); - struct FileBufferMetadata { - // Needed by RingBuffer - size_t buffer_slot_index; - const size_t frame_bytes_size = 2*512*1024*1000; - - uint64_t start_pulse_id; - uint64_t stop_pulse_id; - uint16_t module_id; - - uint64_t pulse_id[1000]; - uint64_t frame_id[1000]; - uint32_t daq_rec[1000]; - uint16_t n_received_packets[1000]; - }; - size_t n_modules = 32; RingBuffer ring_buffer(3); @@ -95,7 +82,7 @@ int main (int argc, char *argv[]) auto frame_id_dataset = input_file.openDataSet("frame_id"); frame_id_dataset.read( - file_metadata->frame_id, H5::PredType::NATIVE_UINT64); + file_metadata->frame_index, H5::PredType::NATIVE_UINT64); auto daq_rec_dataset = input_file.openDataSet("daq_rec"); daq_rec_dataset.read(