From 7080109a4a4648c1bc01056ae3f8f0d4326d9e58 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Sun, 8 Nov 2026 10:58:44 +0100 Subject: [PATCH] JFJochReceiverPedestal: send nothing on the preview and metadata sockets A pedestal run never sent a start message there, but the end message still went out, carried over from the old FPGA receiver. Nothing goes to the writer either (no images), so the pedestal receiver now sends no end message at all. The pedestal result reaches the broker through GetFinalStatistics as before. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01HVeDQsU5a8AJUdJPgWevAK --- receiver/JFJochReceiverPedestal.cpp | 10 ++-------- receiver/JFJochReceiverPedestal.h | 6 ++---- receiver/JFJochReceiverService.cpp | 4 +--- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/receiver/JFJochReceiverPedestal.cpp b/receiver/JFJochReceiverPedestal.cpp index 22dcf129d..e44a3b87d 100644 --- a/receiver/JFJochReceiverPedestal.cpp +++ b/receiver/JFJochReceiverPedestal.cpp @@ -11,9 +11,7 @@ JFJochReceiverPedestal::JFJochReceiverPedestal(const DiffractionExperiment &in_e const SpotFindingSettings &in_spot_finding_settings, JFJochReceiverCurrentStatus &in_current_status, JFJochReceiverPlots &in_plots, - ImageBuffer &in_send_buf_ctrl, - ZMQPreviewSocket *in_zmq_preview_socket, - ZMQMetadataSocket *in_zmq_metadata_socket) + ImageBuffer &in_send_buf_ctrl) : JFJochReceiver(in_experiment, in_send_buf_ctrl, in_image_sender, @@ -21,9 +19,7 @@ JFJochReceiverPedestal::JFJochReceiverPedestal(const DiffractionExperiment &in_e in_plots, in_spot_finding_settings, in_logger, - in_pixel_mask, - in_zmq_preview_socket, - in_zmq_metadata_socket), + in_pixel_mask), acquisition_device(in_aq_device), ndatastreams(experiment.GetDataStreamsNum()), pedestal_nthreads((experiment.GetStorageCellNumber() > 2) ? 1 : 4), @@ -193,8 +189,6 @@ void JFJochReceiverPedestal::FinalizeMeasurement() { current_status.SetProgress(1.0); current_status.SetStatus(GetStatus()); - SendEndMessage(); - end_time = std::chrono::system_clock::now(); for (auto &future: data_acquisition_futures) diff --git a/receiver/JFJochReceiverPedestal.h b/receiver/JFJochReceiverPedestal.h index 59b97a9b2..af423ec70 100644 --- a/receiver/JFJochReceiverPedestal.h +++ b/receiver/JFJochReceiverPedestal.h @@ -12,7 +12,7 @@ #include "../acquisition_device/AcquisitionDeviceGroup.h" #include "../jungfrau/JFPedestalCalc.h" -// A pedestal run: raw frames from the devices go into JFPedestalCalc; no image buffer slots, nothing to the writer +// A pedestal run: raw frames from the devices go into JFPedestalCalc; no image buffer slots, nothing goes out on any socket class JFJochReceiverPedestal : public JFJochReceiver { std::vector> pedestal; @@ -48,9 +48,7 @@ public: const SpotFindingSettings &spot_finding_settings, JFJochReceiverCurrentStatus ¤t_status, JFJochReceiverPlots &plots, - ImageBuffer &image_buffer, - ZMQPreviewSocket *zmq_preview_socket, - ZMQMetadataSocket *zmq_metadata_socket); + ImageBuffer &image_buffer); ~JFJochReceiverPedestal() override; JFJochReceiverPedestal(const JFJochReceiverPedestal &other) = delete; JFJochReceiverPedestal &operator=(const JFJochReceiverPedestal &other) = delete; diff --git a/receiver/JFJochReceiverService.cpp b/receiver/JFJochReceiverService.cpp index f792343d3..cf9f767bd 100644 --- a/receiver/JFJochReceiverService.cpp +++ b/receiver/JFJochReceiverService.cpp @@ -128,9 +128,7 @@ void JFJochReceiverService::Start(const DiffractionExperiment &experiment, spot_finding_settings, receiver_status, plots, - image_buffer, - zmq_preview_socket.get(), - zmq_metadata_socket.get()); + image_buffer); } else if (!stream_input) { // Summation on the host runs threads of its own for each image auto fpga_nthreads = nthreads;