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

eiger config json update. det writer image id bugfix

Browse Source
This commit is contained in:
lhdamiani
2021-07-08 18:27:05 +02:00
parent 1f00aed5c2
commit 2a6af029b7
7 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/include/BufferUtils.hpp
+13 -17
View File
@@ -9,30 +9,26 @@ namespace BufferUtils
{
struct DetectorConfig {
const std::string streamvis_address;
const int reduction_factor_streamvis;
const std::string live_analysis_address;
const int reduction_factor_live_analysis;
const std::string PEDE_FILENAME;
const std::string GAIN_FILENAME;
// const std::string streamvis_address;
// const int reduction_factor_streamvis;
// const std::string live_analysis_address;
// const int reduction_factor_live_analysis;
// const std::string PEDE_FILENAME;
// const std::string GAIN_FILENAME;
// const std::string buffer_folder;
const std::string detector_name;
const std::string detector_type;
const int n_modules;
const int image_n_pixels;
const int start_udp_port;
const std::string buffer_folder;
friend std::ostream& operator <<(std::ostream& os, DetectorConfig const& det_config)
{
return os << det_config.streamvis_address << ' '
<< det_config.reduction_factor_streamvis << ' '
<< det_config.live_analysis_address << ' '
<< det_config.reduction_factor_live_analysis << ' '
<< det_config.PEDE_FILENAME << ' '
<< det_config.GAIN_FILENAME << ' '
<< det_config.detector_name << ' '
return os << det_config.detector_name << ' '
<< det_config.detector_type << ' '
<< det_config.n_modules << ' '
<< det_config.start_udp_port << ' '
<< det_config.buffer_folder << ' ';
<< det_config.start_udp_port << ' ';
}
};
core-buffer/src/BufferUtils.cpp
+3 -8
View File
@@ -97,7 +97,7 @@ void* BufferUtils::connect_socket(
string ipc_address = buffer_config::IPC_URL_BASE +
detector_name + "-" +
stream_name;
void* socket = zmq_socket(ctx, ZMQ_SUB);
if (socket == nullptr) {
throw runtime_error(zmq_strerror(errno));
@@ -159,15 +159,10 @@ BufferUtils::DetectorConfig BufferUtils::read_json_config(
config_parameters.ParseStream(isw);
return {
config_parameters["streamvis_stream"].GetString(),
config_parameters["streamvis_rate"].GetInt(),
config_parameters["live_stream"].GetString(),
config_parameters["live_rate"].GetInt(),
config_parameters["pedestal_file"].GetString(),
config_parameters["gain_file"].GetString(),
config_parameters["detector_name"].GetString(),
config_parameters["detector_type"].GetString(),
config_parameters["n_modules"].GetInt(),
config_parameters["image_n_pixels"].GetInt(),
config_parameters["start_udp_port"].GetInt(),
config_parameters["buffer_folder"].GetString(),
};
}