Build Packages / Create release (push) Successful in 21s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 9m40s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 9m49s
Build Packages / build:viewer-tgz:cpu (push) Successful in 11m37s
Build Packages / build:viewer-tgz:cuda (push) Successful in 12m40s
Build Packages / build:windows:nocuda (push) Successful in 17m44s
Build Packages / build:windows:cuda (push) Successful in 20m13s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 14m41s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m59s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 15m5s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 14m35s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 15m53s
Build Packages / build:rugnux:windows (push) Successful in 11m29s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 18m51s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 18m43s
Build Packages / Generate python client (push) Successful in 51s
Build Packages / build:rpm (rocky8) (push) Successful in 18m51s
Build Packages / Build documentation (push) Successful in 1m21s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 18m38s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 18m24s
Build Packages / build:rpm (rocky9) (push) Successful in 19m19s
Build Packages / Unit tests (push) Successful in 1h37m15s
* Building Jungfraujoch no longer needs zlib or Eigen installed on the machine, and the dependencies the build fetches are pinned and updated to current releases. * rugnux: improvements in indexing, lattice selection and geometry post-refinement, which index crystals that previously returned no lattice and keep the better of the two geometries a run measures. * rugnux: improvements in beam-centre measurement, beam-stop detection and space-group determination. * rugnux: the unit cell reported with a determined space group now obeys that group - a cell whose symmetry was confirmed from the intensities is re-refined under it, and a cell the group cannot describe is reported with a warning rather than as it stands. * rugnux drops the stretches of a rotation sweep whose removal measurably improves the merged intensities and reports what became of every frame, and decides the resolution cut on the crystal's own diffraction rather than on its ice rings. * The rugnux results report is machine-readable - every line that is not `KEY= value` data starts with `#` - and states the build it was written by, its authorship and its terms of use (`REPORT_VERSION= 8`). * `jfjoch_viewer`: improvements in the file manager (CBF frames beside HDF5 datasets, a remembered root), the dataset plots, the inspector and the image statistics, plus a settable font size, a view of the rugnux results report, usable performance over a remote display (`ssh -X`) and a reset of all settings to defaults; the reciprocal-space window is removed. * Broker fixes around DECTRIS collections and dark-mask calibration: re-initialising after a run that never started no longer freezes the broker, a cancelled calibration is abandoned instead of reported as done, and a collection whose start message never arrives ends by itself. Reviewed-on: #79 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
89 lines
3.4 KiB
C++
89 lines
3.4 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <future>
|
|
#include <latch>
|
|
|
|
#include "JFJochReceiver.h"
|
|
#include "../common/DiffractionExperiment.h"
|
|
#include "../common/PixelMask.h"
|
|
#include "../common/ImageBuffer.h"
|
|
#include "../common/Logger.h"
|
|
#include "../image_pusher/ImagePusher.h"
|
|
#include "../preview/PreviewImage.h"
|
|
#include "../preview/ZMQPreviewSocket.h"
|
|
#include "../preview/ZMQMetadataSocket.h"
|
|
#include "LossyFilter.h"
|
|
#include "../common/MovingAverage.h"
|
|
#include "JFJochReceiverCurrentStatus.h"
|
|
#include "../common/JFJochReceiverPlots.h"
|
|
#include "JFJochReceiverOutput.h"
|
|
#include "../image_puller/ZMQImagePuller.h"
|
|
#include "../image_analysis/MXAnalysisWithoutFPGA.h"
|
|
#include "../image_analysis/dark_mask_analysis/DarkMaskAnalysis.h"
|
|
|
|
class JFJochReceiverLite : public JFJochReceiver {
|
|
// Overriding Cancel(bool) below would otherwise hide the Cancel(const JFJochException &)
|
|
// the analysis threads call.
|
|
using JFJochReceiver::Cancel;
|
|
|
|
ImagePuller &image_puller;
|
|
|
|
std::atomic<bool> end_message_received{false};
|
|
|
|
// Set when the caller reports the run is over - JFJochServices::Stop cancels the receiver
|
|
// silently once the detector reads back idle. Only consulted while waiting for the start
|
|
// message; a silent cancel must not interrupt images that are still being processed.
|
|
std::atomic<bool> detector_finished{false};
|
|
|
|
// How long a start message may still be in flight after the detector reported it had finished.
|
|
// The detector can also read back as idle for a moment just after it was armed, so a run is not
|
|
// abandoned the instant the silent cancel arrives.
|
|
constexpr static auto StartMessageGrace = std::chrono::seconds(5);
|
|
|
|
const int64_t data_analysis_nthreads;
|
|
|
|
std::vector<std::future<void>> data_analysis_futures;
|
|
std::future<void> measurement;
|
|
|
|
std::latch measurement_started;
|
|
std::latch data_analysis_started;
|
|
|
|
DarkMaskAnalysis dark_mask_analysis;
|
|
|
|
void MaskThread(uint32_t id);
|
|
void MeasurementThread();
|
|
void DataAnalysisThread(uint32_t id);
|
|
void Configure(const StartMessage &message);
|
|
public:
|
|
|
|
static int64_t NumberOfDataAnalysisThreads(int64_t requested_thread_number, const DiffractionExperiment& experiment);
|
|
|
|
JFJochReceiverLite(const DiffractionExperiment& experiment,
|
|
const PixelMask &pixel_mask,
|
|
ImagePuller &image_puller,
|
|
ImagePusher &image_pusher,
|
|
Logger &logger, int64_t forward_and_sum_nthreads,
|
|
const SpotFindingSettings &spot_finding_settings,
|
|
JFJochReceiverCurrentStatus ¤t_status,
|
|
JFJochReceiverPlots &plots,
|
|
ImageBuffer &image_buffer,
|
|
ZMQPreviewSocket *zmq_preview_socket = nullptr,
|
|
ZMQMetadataSocket *zmq_metadata_socket = nullptr,
|
|
IndexerThreadPool *indexing_thread_pool = nullptr);
|
|
~JFJochReceiverLite() override;
|
|
|
|
void StopReceiver() override;
|
|
void Cancel(bool silent) override;
|
|
|
|
float GetEfficiency() const override;
|
|
float GetProgress() const override;
|
|
|
|
void SetSpotFindingSettings(const SpotFindingSettings &spot_finding_settings) override;
|
|
JFJochReceiverOutput GetFinalStatistics() const override;
|
|
};
|
|
|
|
|