From dce0cc162895a4db9661c9b8414ecf7d0649121b Mon Sep 17 00:00:00 2001 From: Dmitry Ozerov Date: Tue, 2 Jun 2020 09:43:46 +0200 Subject: [PATCH] new pedestal for Bernina 16M and json library in makefile --- sf-stream/CMakeLists.txt | 5 +++-- sf-stream/src/main.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sf-stream/CMakeLists.txt b/sf-stream/CMakeLists.txt index 216e2dd..5ea58fa 100644 --- a/sf-stream/CMakeLists.txt +++ b/sf-stream/CMakeLists.txt @@ -12,7 +12,8 @@ set_target_properties(sf-stream PROPERTIES OUTPUT_NAME sf_stream) target_link_libraries(sf-stream sf-stream-lib zmq - pthread) + pthread + jsoncpp) enable_testing() -add_subdirectory(test/) \ No newline at end of file +add_subdirectory(test/) diff --git a/sf-stream/src/main.cpp b/sf-stream/src/main.cpp index 2c236ef..0221b16 100644 --- a/sf-stream/src/main.cpp +++ b/sf-stream/src/main.cpp @@ -120,7 +120,7 @@ int main (int argc, char *argv[]) header["pulse_id"] = (Json::Value::UInt64)pulse_id; //this needs to be re-read from external source - header["pedestal_file"] = "/sf/bernina/data/p17534/res/JF_pedestals/pedestal_20200423_1018.JF07T32V01.res.h5"; + header["pedestal_file"] = "/sf/bernina/data/p17534/res/JF_pedestals/pedestal_20200529_1408.JF07T32V01.res.h5"; header["gain_file"] = "/sf/bernina/config/jungfrau/gainMaps/JF07T32V01/gains.h5"; header["number_frames_expected"] = 10000;