Build Packages / Create release (push) Successful in 24s
Build Packages / build:viewer:macos-arm64:nocuda (push) Successful in 3m29s
Build Packages / build:rugnux:macos-arm64:nocuda (push) Successful in 2m43s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 8m27s
Build Packages / build:rugnux:linux-x86_64:cuda (push) Successful in 9m53s
Build Packages / build:viewer:linux-x86_64:nocuda (push) Successful in 9m58s
Build Packages / build:viewer:linux-x86_64:cuda (push) Successful in 11m22s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 13m39s
Build Packages / build:viewer:windows-x86_64:nocuda (push) Successful in 18m37s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 16m32s
Build Packages / build:viewer:windows-x86_64:cuda (push) Successful in 24m11s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m30s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 19m3s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 20m23s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 19m41s
Build Packages / Generate python client (push) Successful in 50s
Build Packages / Build documentation (push) Successful in 1m16s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 21m0s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 18m38s
Build Packages / build:rugnux:windows-x86_64:cuda (push) Successful in 14m33s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 17m55s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 20m50s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 18m38s
Build Packages / Unit tests (push) Successful in 1h46m14s
* jfjoch_broker: Optional per-dataset authentication - statistics, images and plots can require a bearer token, which jfjoch_viewer supports. * jfjoch_viewer: Dark mode and a theme-matched colour scheme, a magnifier panel, and simpler contrast and background controls. * Rugnux: Multiple performance improvements on GPU and CPU (CPU-only processing up to 40% faster, faster image decoding on ARM), with unchanged results. * Rugnux: `--model` rigid-body refinement runs on the GPU, and the model-validation check is faster and more reliable. * Rugnux: Improved scaling and merging - error model, outlier rejection, absorption correction and French-Wilson amplitudes now agree more closely with XDS and ctruncate. * Rugnux: Improved integration - radial background on powder and ice rings, crowded rotation data keep their reflections, and CPU-only builds integrate large unit cells as GPU builds do. * Rugnux: More robust detector geometry - measured beam centre, X-ray bandwidth and goniometer rate, and geometry refinement accepted only on significant evidence. * Rugnux: Merged files are written in the standard setting, or in the setting of a reference MTZ, structure-factor mmCIF or model, with its free-R flags. * Rugnux: Richer report - ice and powder rings, further lattices, superstructure candidates and mosaicity, with warnings worded as prompts to check. * Rugnux: Clear error messages when a data set needs more GPU or host memory than is available. Reviewed-on: #83 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
95 lines
4.0 KiB
C++
95 lines
4.0 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <mutex>
|
|
#include <memory>
|
|
|
|
#include "JFJochReceiver.h"
|
|
#include "../acquisition_device/AcquisitionDeviceGroup.h"
|
|
|
|
#include "../preview/ZMQMetadataSocket.h"
|
|
#include "../preview/ZMQPreviewSocket.h"
|
|
|
|
class JFJochReceiverService {
|
|
std::unique_ptr<JFJochReceiver> receiver;
|
|
AcquisitionDeviceGroup &aq_devices;
|
|
Logger &logger;
|
|
ImageBuffer image_buffer;
|
|
ImagePusher &image_pusher;
|
|
std::shared_ptr<ImagePuller> image_puller;
|
|
int64_t nthreads = 8;
|
|
|
|
enum class ReceiverState {Idle, Running};
|
|
ReceiverState state = ReceiverState::Idle;
|
|
mutable std::mutex state_mutex;
|
|
std::condition_variable measurement_done;
|
|
std::future<void> measurement;
|
|
void FinalizeMeasurement();
|
|
void FinalizeMeasurementChangeState();
|
|
SpotFindingSettings spot_finding_settings;
|
|
|
|
PreviewImage preview_image;
|
|
std::unique_ptr<ZMQPreviewSocket> zmq_preview_socket;
|
|
std::unique_ptr<ZMQMetadataSocket> zmq_metadata_socket;
|
|
std::unique_ptr<IndexerThreadPool> indexer_thread_pool;
|
|
|
|
JFJochReceiverCurrentStatus receiver_status;
|
|
JFJochReceiverPlots plots;
|
|
public:
|
|
JFJochReceiverService(AcquisitionDeviceGroup &aq_devices,
|
|
Logger &logger,
|
|
ImagePusher &pusher,
|
|
size_t send_buffer_size_MiB = 512);
|
|
JFJochReceiverService& NumThreads(int64_t input);
|
|
JFJochReceiverService& PreviewSocket(const std::string &addr, const std::optional<int32_t> &watermark = {});
|
|
JFJochReceiverService& MetadataSocket(const std::string &addr);
|
|
|
|
JFJochReceiverService& PreviewSocketSettings(const ZMQPreviewSettings &input);
|
|
JFJochReceiverService& MetadataSocketSettings(const ZMQMetadataSettings &input);
|
|
JFJochReceiverService& Indexing(const IndexingSettings& input);
|
|
|
|
ZMQPreviewSettings GetPreviewSocketSettings() const;
|
|
ZMQMetadataSettings GetMetadataSocketSettings() const;
|
|
|
|
std::string GetPreviewSocketAddress() const;
|
|
std::string GetMetadataSocketAddress() const;
|
|
|
|
void LoadInternalGeneratorImage(const DiffractionExperiment& experiment,
|
|
const std::vector<uint16_t> &raw_expected_image,
|
|
uint64_t image_number);
|
|
// Ask the writer whether this run's output could be written, before anything is started.
|
|
// Throws if it could not.
|
|
void Preflight(const DiffractionExperiment &experiment);
|
|
void Start(const DiffractionExperiment &experiment,
|
|
const PixelMask &pixel_mask,
|
|
const JFCalibration *calibration,
|
|
std::shared_ptr<ImagePuller> puller = {});
|
|
void Cancel(bool silent);
|
|
JFJochReceiverOutput Stop();
|
|
void SetSpotFindingSettings(const SpotFindingSettings& settings);
|
|
MultiLinePlot GetDataProcessingPlot(const PlotRequest& request);
|
|
void GetPlotRaw(std::vector<float> &v, PlotType type, const std::string &roi);
|
|
|
|
std::optional<JFJochReceiverStatus> GetStatus();
|
|
std::vector<AcquisitionDeviceNetConfig> GetNetworkConfig();
|
|
std::vector<DeviceStatus> GetDeviceStatus() const;
|
|
std::optional<float> GetProgress() const;
|
|
|
|
void GetXFELEventCode(std::vector<uint64_t> &v) const;
|
|
void GetXFELPulseID(std::vector<uint64_t> &v) const;
|
|
|
|
void GetStartMessageFromBuffer(std::vector<uint8_t> &v);
|
|
bool GetImageFromBuffer(std::vector<uint8_t> &v, int64_t image_number = ImageBuffer::MaxImage);
|
|
std::string GetTIFFFromBuffer(int64_t image_number = ImageBuffer::MaxImage);
|
|
std::string GetJPEGFromBuffer(const PreviewImageSettings &settings, int64_t image_number = ImageBuffer::MaxImage);
|
|
ImageBufferStatus GetImageBufferStatus() const;
|
|
void ClearImageBuffer();
|
|
// Drop everything the previous run left readable - its status, plots and buffered images - so
|
|
// nothing of it is served under the next run's tokens. Idle only.
|
|
void ClearResults();
|
|
|
|
ImagePusherStatus GetImagePusherStatus() const;
|
|
};
|