mirror of
https://github.com/paulscherrerinstitute/sf_daq_buffer.git
synced 2026-06-06 20:58:41 +02:00
Rename struct variable
This commit is contained in:
@@ -15,7 +15,7 @@ struct ImageMetadata
|
||||
uint64_t frame_index;
|
||||
uint32_t daq_rec;
|
||||
uint8_t is_good_frame;
|
||||
uint64_t compressed_image_size;
|
||||
uint64_t data_n_bytes;
|
||||
};
|
||||
|
||||
class WriterH5Writer {
|
||||
|
||||
@@ -19,7 +19,7 @@ WriterH5Writer::WriterH5Writer(
|
||||
current_write_index_(0)
|
||||
{
|
||||
|
||||
bshuf_register_h5filter();
|
||||
// bshuf_register_h5filter();
|
||||
|
||||
file_ = H5::H5File(output_file, H5F_ACC_TRUNC);
|
||||
|
||||
@@ -33,16 +33,16 @@ WriterH5Writer::WriterH5Writer(
|
||||
H5::DSetCreatPropList image_dataset_properties;
|
||||
image_dataset_properties.setChunk(3, image_dataset_chunking);
|
||||
|
||||
// block_size, compression type
|
||||
uint compression_prop[] =
|
||||
{MODULE_N_PIXELS, //block size
|
||||
BSHUF_H5_COMPRESS_LZ4}; // Compression type
|
||||
|
||||
H5Pset_filter(image_dataset_properties.getId(),
|
||||
BSHUF_H5FILTER,
|
||||
H5Z_FLAG_MANDATORY,
|
||||
2,
|
||||
&(compression_prop[0]));
|
||||
// // block_size, compression type
|
||||
// uint compression_prop[] =
|
||||
// {MODULE_N_PIXELS, //block size
|
||||
// BSHUF_H5_COMPRESS_LZ4}; // Compression type
|
||||
//
|
||||
// H5Pset_filter(image_dataset_properties.getId(),
|
||||
// BSHUF_H5FILTER,
|
||||
// H5Z_FLAG_MANDATORY,
|
||||
// 2,
|
||||
// &(compression_prop[0]));
|
||||
|
||||
image_dataset_ = file_.createDataSet(
|
||||
"image",
|
||||
@@ -114,7 +114,7 @@ void WriterH5Writer::write(const ImageMetadata* metadata, const char* data) {
|
||||
H5P_DEFAULT,
|
||||
BSHUF_H5FILTER,
|
||||
image_offset,
|
||||
metadata->compressed_image_size,
|
||||
metadata->data_n_bytes,
|
||||
data))
|
||||
{
|
||||
throw runtime_error("Cannot write image dataset.");
|
||||
|
||||
@@ -56,7 +56,7 @@ void WriterZmqReceiver::get_next_image(
|
||||
image_metadata->pulse_id = pulse_id;
|
||||
image_metadata->frame_index = 0;
|
||||
image_metadata->daq_rec = 0;
|
||||
image_metadata->compressed_image_size = 0;
|
||||
image_metadata->data_n_bytes = 0;
|
||||
image_metadata->is_good_frame = 1;
|
||||
bool image_metadata_init = false;
|
||||
|
||||
@@ -141,5 +141,5 @@ void WriterZmqReceiver::get_next_image(
|
||||
image_buffer_offset += n_bytes_image;
|
||||
}
|
||||
|
||||
image_metadata->compressed_image_size = image_buffer_offset;
|
||||
image_metadata->data_n_bytes = image_buffer_offset;
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ TEST(WriterH5Writer, basic_interaction)
|
||||
auto metadata = make_shared<ImageMetadata>();
|
||||
|
||||
// Needed by writer.
|
||||
metadata->compressed_image_size = 500;
|
||||
metadata->data_n_bytes = 500;
|
||||
|
||||
WriterH5Writer writer("ignore.h5", n_frames, n_modules);
|
||||
writer.write(metadata.get(), data.get());
|
||||
@@ -62,7 +62,7 @@ TEST(WriterH5Writer, test_compression)
|
||||
}
|
||||
|
||||
auto metadata = make_shared<ImageMetadata>();
|
||||
metadata->compressed_image_size = total_compressed_size;
|
||||
metadata->data_n_bytes = total_compressed_size;
|
||||
|
||||
metadata->is_good_frame = 1;
|
||||
metadata->frame_index = 3;
|
||||
|
||||
@@ -68,6 +68,6 @@ TEST(WriterZmqReceiver, basic_test)
|
||||
EXPECT_EQ(pulse_id, image_metadata.pulse_id);
|
||||
EXPECT_EQ(image_metadata.is_good_frame, 1);
|
||||
EXPECT_EQ(image_metadata.daq_rec, 4);
|
||||
EXPECT_EQ(image_metadata.compressed_image_size,
|
||||
EXPECT_EQ(image_metadata.data_n_bytes,
|
||||
5000*n_modules+BSHUF_LZ4_HEADER_BYTES);
|
||||
}
|
||||
Reference in New Issue
Block a user