From 0a90e4437d1c16137649861be8dc334a175a8380 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Thu, 23 Apr 2020 09:51:39 +0200 Subject: [PATCH] Cleanup of sf_buffer --- sf-buffer/src/sf_buffer.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sf-buffer/src/sf_buffer.cpp b/sf-buffer/src/sf_buffer.cpp index 9f83dca..b73610e 100644 --- a/sf-buffer/src/sf_buffer.cpp +++ b/sf-buffer/src/sf_buffer.cpp @@ -9,6 +9,7 @@ using namespace std; +using namespace core_buffer; int main (int argc, char *argv[]) { @@ -28,7 +29,7 @@ int main (int argc, char *argv[]) { int udp_port = atoi(argv[2]); string root_folder = string(argv[3]); - RingBuffer ring_buffer(core_buffer::BUFFER_RB_SIZE); + RingBuffer ring_buffer(BUFFER_RB_SIZE); UdpRecvModule udp_module(ring_buffer); udp_module.start_recv(udp_port, JUNGFRAU_DATA_BYTES_PER_FRAME); @@ -39,7 +40,8 @@ int main (int argc, char *argv[]) { uint64_t last_pulse_id = 0; FastH5Writer writer( - core_buffer::FILE_MOD, 512, 1024, device_name, root_folder); + core_buffer::FILE_MOD, MODULE_Y_SIZE, MODULE_X_SIZE, + device_name, root_folder); writer.add_scalar_metadata("pulse_id"); writer.add_scalar_metadata("frame_id"); @@ -59,6 +61,8 @@ int main (int argc, char *argv[]) { writer.write_data(data.second); + // TODO: Combine all this into 1 struct. + writer.write_scalar_metadata( "pulse_id", &(data.first->pulse_id));