merge with current ram_buffer branch

This commit is contained in:
hax_l committed 2021-02-17 16:22:39 +01:00
commit dda2f9610e
43 files changed
+1052 -779

No files matched your search

-2
View File
@@ -4,7 +4,5 @@ target_link_libraries(core-buffer-tests
core-buffer-lib
external
rt
hdf5
hdf5_cpp
zmq
gtest)
+1 -1
View File
@@ -29,7 +29,7 @@ TEST(RamBuffer, simple_store)
}
ImageMetadata image_meta;
buffer.read_image(frame_meta.pulse_id, image_meta);
buffer.assemble_image(frame_meta.pulse_id, image_meta);
ASSERT_EQ(image_meta.pulse_id, frame_meta.pulse_id);
ASSERT_EQ(image_meta.daq_rec, frame_meta.daq_rec);
ASSERT_EQ(image_meta.frame_index, frame_meta.frame_index);