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

Adjust stream sender to use reference

Browse Source
This commit is contained in:
babic_a
2020-09-21 09:56:06 +02:00
parent 2f892539be
commit 3e097a5cd8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sf-stream/include/ZmqLiveSender.hpp
+1 -1
View File
@@ -38,7 +38,7 @@ public:
const LiveStreamConfig& config);
~ZmqLiveSender();
void send(const ImageMetadata* meta, const char* data);
void send(const ImageMetadata& meta, const char* data);
};
sf-stream/src/ZmqLiveSender.cpp
+7 -7
View File
@@ -88,7 +88,7 @@ ZmqLiveSender::~ZmqLiveSender()
zmq_close(socket_live_);
}
void ZmqLiveSender::send(const ImageMetadata *meta, const char *data)
void ZmqLiveSender::send(const ImageMetadata& meta, const char *data)
{
uint16_t data_empty [] = { 0, 0, 0, 0};
@@ -96,15 +96,15 @@ void ZmqLiveSender::send(const ImageMetadata *meta, const char *data)
auto& header_alloc = header.GetAllocator();
string text_header;
if(zmq_send(socket_pulse_, &meta->pulse_id, sizeof(uint64_t), 0) == -1) {
if(zmq_send(socket_pulse_, &meta.pulse_id, sizeof(uint64_t), 0) == -1) {
throw runtime_error(zmq_strerror(errno));
}
// TODO: Here we need to send to streamvis and live analysis metadata(probably need to operate still on them) and data(not every frame)
header.AddMember("frame", meta->frame_index, header_alloc);
header.AddMember("is_good_frame", meta->is_good_image, header_alloc);
header.AddMember("daq_rec", meta->daq_rec, header_alloc);
header.AddMember("pulse_id", meta->pulse_id, header_alloc);
header.AddMember("frame", meta.frame_index, header_alloc);
header.AddMember("is_good_frame", meta.is_good_image, header_alloc);
header.AddMember("daq_rec", meta.daq_rec, header_alloc);
header.AddMember("pulse_id", meta.pulse_id, header_alloc);
rapidjson::Value pedestal_file;
pedestal_file.SetString(config_.PEDE_FILENAME.c_str(), header_alloc);
@@ -118,7 +118,7 @@ void ZmqLiveSender::send(const ImageMetadata *meta, const char *data)
rapidjson::Value run_name;
run_name.SetString(
to_string(uint64_t(meta->pulse_id/10000)*10000).c_str(),
to_string(uint64_t(meta.pulse_id/10000)*10000).c_str(),
header_alloc);
header.AddMember("run_name", run_name, header_alloc);