sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-04-21 14:44:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

bugfix order of params from json config

Browse Source
This commit is contained in:
babic_a
2022-01-05 23:45:45 +01:00
parent 9986d21e85
commit 48b68668f4
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/include/BufferUtils.hpp
+3 -3
View File
@@ -12,10 +12,10 @@ namespace BufferUtils
const std::string detector_name;
const std::string detector_type;
const int n_modules;
const int bit_depth;
const int image_height;
const int image_width;
const int start_udp_port;
const int bit_depth;
friend std::ostream& operator <<(std::ostream& os, DetectorConfig const& det_config)
@@ -23,10 +23,10 @@ namespace BufferUtils
return os << det_config.detector_name << ' '
<< det_config.detector_type << ' '
<< det_config.n_modules << ' '
<< det_config.start_udp_port << ' '
<< det_config.bit_depth << ' '
<< det_config.image_height << ' '
<< det_config.image_width << ' ';
<< det_config.image_width << ' '
<< det_config.start_udp_port << ' ';
}
};
core-buffer/src/BufferUtils.cpp
+1 -1
View File
@@ -162,9 +162,9 @@ BufferUtils::DetectorConfig BufferUtils::read_json_config(
config_parameters["detector_name"].GetString(),
config_parameters["detector_type"].GetString(),
config_parameters["n_modules"].GetInt(),
config_parameters["bit_depth"].GetInt(),
config_parameters["image_height"].GetInt(),
config_parameters["image_width"].GetInt(),
config_parameters["bit_depth"].GetInt(),
config_parameters["start_udp_port"].GetInt(),
};
}
std-udp-recv/include/UdpRecvConfig.hpp
+5 -1
View File
@@ -20,6 +20,8 @@ struct UdpRecvConfig {
config_parameters["detector_type"].GetString(),
config_parameters["n_modules"].GetInt(),
config_parameters["bit_depth"].GetInt(),
config_parameters["image_height"].GetInt(),
config_parameters["image_width"].GetInt(),
config_parameters["start_udp_port"].GetInt(),
};
}
@@ -27,8 +29,10 @@ struct UdpRecvConfig {
const std::string detector_name;
const std::string detector_type;
const int n_modules;
const int start_udp_port;
const int bit_depth;
const int image_height;
const int image_width;
const int start_udp_port;
};