sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-05-13 07:05:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

detached sync and assembler with zmq recv.

Browse Source
This commit is contained in:
lhdamiani
2021-07-06 11:57:43 +02:00
parent 300d992acf
commit 8fd1c4cf7a
14 changed files with 129 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/include/BufferUtils.hpp
-2
View File
@@ -18,7 +18,6 @@ namespace BufferUtils
const std::string detector_name;
const int n_modules;
const int n_submodules;
const int start_udp_port;
const std::string buffer_folder;
@@ -32,7 +31,6 @@ namespace BufferUtils
<< det_config.GAIN_FILENAME << ' '
<< det_config.detector_name << ' '
<< det_config.n_modules << ' '
<< det_config.n_submodules << ' '
<< det_config.start_udp_port << ' '
<< det_config.buffer_folder << ' ';
}
core-buffer/include/formats.hpp
+5 -2
View File
@@ -16,6 +16,10 @@ struct ModuleFrame {
};
#pragma pack(pop)
// ImageMetadata status convention
// 0 good image
// 1 frames with missing packets
// 2 frames with different ids
#pragma pack(push)
#pragma pack(1)
@@ -26,11 +30,10 @@ struct ImageMetadata {
uint64_t dtype;
uint64_t encoding;
uint64_t source_id;
uint64_t status;
uint64_t status;
uint64_t user_1;
uint64_t user_2;
};
#pragma pack(pop)
#endif //SF_DAQ_BUFFER_FORMATS_HPP
core-buffer/src/BufferUtils.cpp
-1
View File
@@ -167,7 +167,6 @@ BufferUtils::DetectorConfig BufferUtils::read_json_config(
config_parameters["gain_file"].GetString(),
config_parameters["detector_name"].GetString(),
config_parameters["n_modules"].GetInt(),
config_parameters["n_submodules"].GetInt(),
config_parameters["start_udp_port"].GetInt(),
config_parameters["buffer_folder"].GetString(),
};
core-buffer/src/RamBuffer.cpp
+2 -3
View File
@@ -84,9 +84,9 @@ void RamBuffer::write_frame(
const char *src_data) const
{
auto *dst_meta = (ModuleFrame*) get_frame_meta(
src_meta.pulse_id, src_meta.module_id);
src_meta.id, src_meta.module_id);
auto *dst_data = get_frame_data(
src_meta.pulse_id, src_meta.module_id);
src_meta.id, src_meta.module_id);
#ifdef DEBUG_OUTPUT
using namespace date;
@@ -96,7 +96,6 @@ void RamBuffer::write_frame(
cout << " || src_meta.n_recv_packets " << src_meta.n_recv_packets;
cout << " || src_meta.daq_rec " << src_meta.daq_rec;
cout << " || src_meta.module_id " << src_meta.module_id;
cout << " || dst_meta " << &dst_meta;
cout << endl;
#endif
core-buffer/test/test_RamBuffer.cpp
+1 -1
View File
@@ -33,5 +33,5 @@ TEST(RamBuffer, simple_store)
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);
ASSERT_EQ(image_meta.is_good_image, 1);
ASSERT_EQ(image_meta.status, 0);
}