JFJochReceiverDarkMask: send nothing on the preview and metadata sockets

As for pedestal runs: the dark frames of the mask sequence are no images
for preview or metadata consumers, so the dark mask receiver no longer
takes the two sockets. The mask reaches the broker through
GetFinalStatistics as before.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01HVeDQsU5a8AJUdJPgWevAK
This commit is contained in:
leonarski_fandClaude Opus 5.5 committed 2026-11-08 11:12:23 +01:00
1 parent 97cfae1fd8
commit 72310c2ee1
3 files changed
+5 -13

No files matched your search

+2 -6
View File
@@ -13,9 +13,7 @@ JFJochReceiverDarkMask::JFJochReceiverDarkMask(const DiffractionExperiment &in_e
const SpotFindingSettings &in_spot_finding_settings,
JFJochReceiverCurrentStatus &in_current_status,
JFJochReceiverPlots &in_plots,
ImageBuffer &in_image_buffer,
ZMQPreviewSocket *in_zmq_preview_socket,
ZMQMetadataSocket *in_zmq_metadata_socket)
ImageBuffer &in_image_buffer)
: JFJochReceiverStream(in_experiment,
in_pixel_mask,
in_image_puller,
@@ -25,9 +23,7 @@ JFJochReceiverDarkMask::JFJochReceiverDarkMask(const DiffractionExperiment &in_e
in_spot_finding_settings,
in_current_status,
in_plots,
in_image_buffer,
in_zmq_preview_socket,
in_zmq_metadata_socket),
in_image_buffer),
mask_buffer(nthreads),
dark_mask_analysis(in_experiment.GetDarkMaskSettings(), in_experiment.GetPixelsNum()) {
StartThreads();
+2 -4
View File
@@ -8,7 +8,7 @@
#include "JFJochReceiverStream.h"
#include "../image_analysis/dark_mask_analysis/DarkMaskAnalysis.h"
// The dark frames of the mask sequence: each goes into DarkMaskAnalysis and the image buffer, nothing is sent.
// The dark frames of the mask sequence: each goes into DarkMaskAnalysis and the image buffer, nothing goes out on any socket.
class JFJochReceiverDarkMask : public JFJochReceiverStream {
std::vector<std::vector<uint8_t>> mask_buffer; // per image thread
DarkMaskAnalysis dark_mask_analysis;
@@ -24,9 +24,7 @@ public:
const SpotFindingSettings &spot_finding_settings,
JFJochReceiverCurrentStatus &current_status,
JFJochReceiverPlots &plots,
ImageBuffer &image_buffer,
ZMQPreviewSocket *zmq_preview_socket = nullptr,
ZMQMetadataSocket *zmq_metadata_socket = nullptr);
ImageBuffer &image_buffer);
~JFJochReceiverDarkMask() override;
JFJochReceiverOutput GetFinalStatistics() const override;
+1 -3
View File
@@ -163,9 +163,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 (rugnux_enable && (experiment.GetDetectorMode() == DetectorMode::Standard) && RugnuxRotationData(experiment))
receiver = std::make_unique<JFJochReceiverRugnuxRotation>(
experiment, pixel_mask, *image_puller, image_pusher, logger, nthreads,