From 04477ff2cf77f72001e1005acaa04ef628188d98 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Mon, 18 May 2020 17:00:14 +0200 Subject: [PATCH] Fixing test until it works --- core-buffer/test/test_WriterH5Writer.cpp | 33 ++++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/core-buffer/test/test_WriterH5Writer.cpp b/core-buffer/test/test_WriterH5Writer.cpp index 103958e..c3b98f5 100644 --- a/core-buffer/test/test_WriterH5Writer.cpp +++ b/core-buffer/test/test_WriterH5Writer.cpp @@ -25,7 +25,7 @@ TEST(WriterH5Writer, basic_interaction) TEST(WriterH5Writer, test_compression) { size_t n_modules = 2; - size_t n_frames = 5; + size_t n_frames = 2; auto comp_buffer_size = bshuf_compress_lz4_bound( MODULE_N_PIXELS, PIXEL_N_BYTES, MODULE_N_PIXELS); @@ -34,26 +34,27 @@ TEST(WriterH5Writer, test_compression) auto f_comp_buffer = make_unique(comp_buffer_size); auto i_comp_buffer = make_unique( - (comp_buffer_size * n_modules) + 12); - auto i_raw_buffer = make_unique((MODULE_N_PIXELS * n_modules)); + (comp_buffer_size * n_modules) + WRITER_COMPRESSION_HEADER_BYTES); + auto i_raw_buffer = make_unique( + MODULE_N_PIXELS * n_modules * n_frames); - bshuf_write_uint64_BE(i_comp_buffer.get(), + bshuf_write_uint64_BE(&i_comp_buffer[0], MODULE_N_BYTES * n_modules); - bshuf_write_uint32_BE(i_comp_buffer.get() + 8, + bshuf_write_uint32_BE(&i_comp_buffer[8], MODULE_N_PIXELS * PIXEL_N_BYTES); - size_t total_compressed_size = 0; + size_t total_compressed_size = WRITER_COMPRESSION_HEADER_BYTES; for (int i_module=0; i_modulepulse_id = 3; metadata->daq_rec = 3; + auto result = bshuf_decompress_lz4( + &i_comp_buffer[12], &i_raw_buffer[0], + MODULE_N_PIXELS*n_modules, PIXEL_N_BYTES, MODULE_N_PIXELS); + WriterH5Writer writer("ignore.h5", n_frames, n_modules); - writer.write(metadata.get(), i_comp_buffer.get()); + writer.write(metadata.get(), &i_comp_buffer[0]); writer.close_file(); H5::H5File reader("ignore.h5", H5F_ACC_RDONLY); auto image_dataset = reader.openDataSet("image"); - image_dataset.read(i_raw_buffer.get(), H5T_NATIVE_UINT16); + image_dataset.read(&i_raw_buffer[0], H5::PredType::NATIVE_UINT16); - ASSERT_EQ(1, 1); + for (int i_module=0; i_module