Build Packages / Create release (push) Successful in 7s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 4m56s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 9m10s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 13m51s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 16m56s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 20m59s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 21m25s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 21m17s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 14m14s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m59s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 25m48s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 15m52s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 19m33s
Build Packages / Generate python client (push) Successful in 29s
Build Packages / Build documentation (push) Successful in 1m19s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 20m49s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 25m31s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 25m24s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 26m5s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 22m19s
Build Packages / Unit tests (push) Failing after 2h28m24s
Build Packages / Validation Battery (push) Successful in 40m33s
* Rugnux: Processes a collection live while jfjoch_broker writes it (`rugnux <master.h5> <broker URL>`). * Rugnux: Processing starts on the first images and confirms its choices once all are in, so analysis can begin during collection. * Rugnux: Faster processing, especially on servers with several GPUs and CPU sockets and on computers without a GPU (`--no-gpu`, macOS). * Rugnux: Uses much less GPU memory, so large data sets stay on the GPU of smaller cards, and a data set too large for the card is processed on the CPU instead. * Rugnux: On macOS, Bragg integration runs on the Apple GPU. * Rugnux: Better handling of twinning and pseudo-symmetry, with the twin hypothesis written as `<prefix>_twin_<SG>.mtz`, and a wrong `--model` no longer confirms the data or decides the hand. * Rugnux: `--model` accepts predicted (AlphaFold) models and falls back to molecular replacement when the model is not placed as a rigid body (experimental `--mr` forces it), settling space group, hand and twinning and writing a different answer as `<prefix>_mr.mtz`. * Rugnux: Molecular replacement is faster and settles the space group in more cases with several copies in the asymmetric unit. * Rugnux: Deposition-ready mmCIF, a richer report, and numbered steps on the terminal with the full log in `<prefix>_log.txt`; `_P1.mtz`, `--estimate-beam-center` and `--beam-center-search` are removed. * Rugnux: The beam-stop shadow is found correctly on tilted detectors. * Rugnux: Stills files that record a stationary goniometer axis get the default stills geometry refinement. * jfjoch_viewer: "Analyze dataset" uses the same defaults as a bare `rugnux <file>`, and shows the results of processed CBF, marCCD and SMV sweeps. * jfjoch_viewer: The Files panel refreshes on F5 and every few seconds, and the plot type and other selections stay put during live collection. * jfjoch_writer: Memory stays bounded and old data files are closed efficiently on long runs, any failure ends the run in an error state the broker is told about, and the master file appears only after its data files; the ZeroMQ pusher logs when a stalled writer makes it drop images. * Fixes: The TCP image pusher no longer blocks the broker's receiver, GPU out-of-memory failures stop with a clear message, and the XDS plugin masks module and chip edges. --------- Co-authored-by: Filip Leonarski <jungfrau@filips-mac-mini.home> Reviewed-on: #85 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
80 lines
2.9 KiB
C++
80 lines
2.9 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <memory>
|
|
#include <mutex>
|
|
#include <nlohmann/json.hpp>
|
|
|
|
#include "../common/DetectorSetup.h"
|
|
#include "../common/DiffractionExperiment.h"
|
|
|
|
struct SimplonConfig {
|
|
nlohmann::json min;
|
|
nlohmann::json max;
|
|
nlohmann::json val;
|
|
std::vector<std::string> allowed_values;
|
|
std::string unit;
|
|
};
|
|
|
|
enum class SimplonState {Na, Ready, Initialize, Configure, Acquire, Idle, Test, Error};
|
|
enum class SimplonDetectorCommand {Initialize, Arm, Disarm, Trigger, Cancel};
|
|
|
|
std::string to_string(SimplonState state);
|
|
|
|
namespace httplib { class Client; }
|
|
|
|
class DectrisSimplonClient {
|
|
std::string hostname;
|
|
uint16_t port;
|
|
|
|
// Two connections, each kept alive and reused: one for commands and configuration, which can take
|
|
// minutes (initialize, disarm, threshold change), and one for reading status and configuration,
|
|
// so that status polls are never stuck behind a long command. httplib::Client cannot run requests
|
|
// from several threads at once (status polling, cancel and the HTTP status endpoint can overlap),
|
|
// so each request holds the mutex of its connection.
|
|
std::mutex cmd_mutex;
|
|
std::unique_ptr<httplib::Client> cmd_http;
|
|
std::mutex status_mutex;
|
|
std::unique_ptr<httplib::Client> status_http;
|
|
|
|
enum class SimplonModule {Detector, Stream, Filewriter, Monitor};
|
|
enum class SimplonTask {Config, Command, Status};
|
|
|
|
constexpr static const std::string_view api_version = "1.8.0";
|
|
|
|
static std::string GenAddr(SimplonModule element, SimplonTask task, const std::string& key);
|
|
|
|
SimplonConfig GetDetCfg(const std::string& key);
|
|
SimplonConfig GetConfig(SimplonModule element, SimplonTask task, const std::string &key);
|
|
SimplonConfig GetConfig(SimplonModule element, const std::string &key);
|
|
nlohmann::json GetStatus(SimplonModule element, const std::string &key);
|
|
void SetConfig(SimplonModule element, const std::string &key, const nlohmann::json &value);
|
|
void SetConfigIfDifferent(SimplonModule element, const std::string &key, float value, float tolerance);
|
|
void SetConfigIfDifferent(SimplonModule element, const std::string &key, int64_t value);
|
|
|
|
void SendDetectorCommand(SimplonDetectorCommand cmd);
|
|
public:
|
|
explicit DectrisSimplonClient(const std::string& hostname, uint16_t port = 80);
|
|
~DectrisSimplonClient();
|
|
void ReadDetectorConfig(DetectorSetup &setup);
|
|
void ConfigureDetector(const DiffractionExperiment& experiment);
|
|
void StartAcquisition(const DiffractionExperiment& experiment);
|
|
void EndAcquisitionFinished();
|
|
void CancelAcquisition();
|
|
void TriggerAcquisition();
|
|
void InitializeDetector(DetectorSetup& setup);
|
|
|
|
SimplonState GetState();
|
|
std::string GetErrorStatus();
|
|
|
|
float GetHumidity();
|
|
float GetTemperature();
|
|
|
|
std::vector<uint32_t> GetPixelMask();
|
|
};
|
|
|
|
|
|
|