diff --git a/sf-stream/src/ZmqLiveSender.hpp b/sf-stream/include/ZmqLiveSender.hpp similarity index 59% rename from sf-stream/src/ZmqLiveSender.hpp rename to sf-stream/include/ZmqLiveSender.hpp index ba7d0a1..6db77fa 100644 --- a/sf-stream/src/ZmqLiveSender.hpp +++ b/sf-stream/include/ZmqLiveSender.hpp @@ -22,24 +22,7 @@ struct LiveStreamConfig { const int n_modules; }; -LiveStreamConfig read_json_config(const std::string filename) -{ - std::ifstream ifs(filename); - rapidjson::IStreamWrapper isw(ifs); - rapidjson::Document config_parameters; - 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["n_modules"].GetInt() - }; -} +LiveStreamConfig read_json_config(const std::string filename); class ZmqLiveSender { const void* ctx_; diff --git a/sf-stream/src/ZmqLiveSender.cpp b/sf-stream/src/ZmqLiveSender.cpp index bdf7c28..6538f64 100644 --- a/sf-stream/src/ZmqLiveSender.cpp +++ b/sf-stream/src/ZmqLiveSender.cpp @@ -5,6 +5,25 @@ using namespace std; +LiveStreamConfig read_json_config(const std::string filename) +{ + std::ifstream ifs(filename); + rapidjson::IStreamWrapper isw(ifs); + rapidjson::Document config_parameters; + 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["n_modules"].GetInt() + }; +} + ZmqLiveSender::ZmqLiveSender( void* ctx, const LiveStreamConfig& config) :