From ec6050f331cf0b6f963ba287784c061ec9dc77d9 Mon Sep 17 00:00:00 2001 From: Dmitry Ozerov Date: Fri, 20 Aug 2021 12:14:14 +0200 Subject: [PATCH] remove run_name and number_frames_expected from the metadata(they are calculated on stremvis side) --- jf-assembler/README.md | 4 +--- sf-stream/README.md | 4 +--- sf-stream/src/ZmqLiveSender.cpp | 8 -------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/jf-assembler/README.md b/jf-assembler/README.md index ce21a4d..7da1a76 100644 --- a/jf-assembler/README.md +++ b/jf-assembler/README.md @@ -130,8 +130,6 @@ We use following fields in the JSON header: |daq_rec|uint32|daqrec from detector header| |pedestal_file|string|Path to pedestal file| |gain_file|string|Path to gain file| -|number_frames_expected|int|Number of expected frames| -|run_name|string|Name of the run| |detector_name|string|Name of the detector| |htype|string|Value: "array-1.0"| |type|string|Value: "uint16"| @@ -176,4 +174,4 @@ format. ![image_pulse_stream](../docs/sf_daq_buffer-PulseStream.jpg) This is also a "public interface" for anyone who wants to get the current -system pulse_id. \ No newline at end of file +system pulse_id. diff --git a/sf-stream/README.md b/sf-stream/README.md index ce21a4d..7da1a76 100644 --- a/sf-stream/README.md +++ b/sf-stream/README.md @@ -130,8 +130,6 @@ We use following fields in the JSON header: |daq_rec|uint32|daqrec from detector header| |pedestal_file|string|Path to pedestal file| |gain_file|string|Path to gain file| -|number_frames_expected|int|Number of expected frames| -|run_name|string|Name of the run| |detector_name|string|Name of the detector| |htype|string|Value: "array-1.0"| |type|string|Value: "uint16"| @@ -176,4 +174,4 @@ format. ![image_pulse_stream](../docs/sf_daq_buffer-PulseStream.jpg) This is also a "public interface" for anyone who wants to get the current -system pulse_id. \ No newline at end of file +system pulse_id. diff --git a/sf-stream/src/ZmqLiveSender.cpp b/sf-stream/src/ZmqLiveSender.cpp index 67b44c7..0fe4eb6 100644 --- a/sf-stream/src/ZmqLiveSender.cpp +++ b/sf-stream/src/ZmqLiveSender.cpp @@ -74,14 +74,6 @@ void ZmqLiveSender::send(const ImageMetadata& meta, const char *data) gain_file.SetString(config_.GAIN_FILENAME.c_str(), header_alloc); header.AddMember("gain_file", gain_file, header_alloc); - header.AddMember("number_frames_expected", 10000, header_alloc); - - rapidjson::Value run_name; - run_name.SetString( - to_string(uint64_t(meta.pulse_id/10000)*10000).c_str(), - header_alloc); - header.AddMember("run_name", run_name, header_alloc); - rapidjson::Value detector_name; detector_name.SetString(config_.detector_name.c_str(), header_alloc); header.AddMember("detector_name", detector_name, header_alloc);