Files
Jungfraujoch/detector_control/DectrisDetectorWrapper.cpp
T
leonarski_f 54c0100e8e
Build Packages / Unit tests (push) Successful in 1h28m28s
Build Packages / build:windows:nocuda (push) Successful in 14m45s
Build Packages / build:windows:cuda (push) Successful in 13m13s
Build Packages / build:viewer-tgz:cpu (push) Successful in 6m47s
Build Packages / build:viewer-tgz:cuda (push) Successful in 7m22s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m52s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 14m16s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m19s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m50s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 14m40s
Build Packages / build:rpm (rocky8) (push) Successful in 11m18s
Build Packages / build:rpm (rocky9) (push) Successful in 12m4s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 11m55s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m22s
Build Packages / DIALS test (push) Successful in 13m37s
Build Packages / XDS test (durin plugin) (push) Successful in 8m47s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m4s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m45s
Build Packages / Generate python client (push) Successful in 34s
Build Packages / Build documentation (push) Successful in 1m4s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 7m16s
v1.0.0-rc.157 (#67)
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use.

* rugnux: Rebrand the offline data-processing subsystem as `rugnux` and consolidate all offline analysis into the single `rugnux` binary - `jfjoch_process` is now `rugnux`, the former `jfjoch_azint` is now `rugnux --azint-only`, and `jfjoch_scale` is now `rugnux --scale` (see the new docs/NAMING.md and docs/RUGNUX.md). Scaling and merging are on by default for rotation and stills (`--no-merge` disables them), replacing the previous opt-in `-M, --scale-merge`.
* rugnux: CLI fixes - default `-N` to all hardware threads, parse numeric option arguments strictly (reject non-numeric or trailing input instead of silently yielding 0), require `--wavelength > 0`, and correct the reproduced command line and `--scale` reference-cell handling.
* rugnux: De-novo space-group improvements - recover genuine high symmetry and centred Bravais lattices from intensities, add an automatic CC1/2 high-resolution cutoff, and report L-test twinning statistics.
* rugnux: Index weakly-diffracting low-resolution rotation data that previously failed (e.g. F-cubic crystals that diffract only to ~4 A on a detector reaching ~1.5 A). The per-frame indexing gate now measures the indexed fraction only within the resolution range the lattice actually diffracts to, so the many sub-diffraction ice/noise spots no longer make the fraction floor unreachable; the two-pass first pass tries several image-sampling schemes (spread across the whole rotation vs a consecutive wedge whose native stride keeps a reflection's rocking curve continuous, letting the FFT resolve a long axis) and keeps the one that indexes the most frames; and the de-novo space-group search no longer discards all reflections (and crashes) when every resolution shell falls below <I/sigma> = 1.
* rugnux: Lower the low-resolution R-meas for strongly-diffracting rotation data - drop edge-of-sweep truncated fulls whose rocking curve was captured below `--min-captured-fraction` (default 0.7 for rotation), and report R-meas only over the observations kept by outlier rejection (matching XDS). The 0.7 default also strips the partiality-extrapolated fulls that dominate the intensity second moment on weakly-diffracting crystals, so the de-novo space-group search is no longer starved by the error-model I/sigma floor and recovers the correct symmetry (e.g. the F-cubic Benas crystals: Benas_3 -> F432, Benas_7 -> P6122, instead of P4/P1); on the reference battery every other crystal keeps its space group.
* rugnux: Write the refined geometry (beam, tilt, axis) to _process.h5 and place non-standard mmCIF items under a reserved `jfjoch` prefix.
* jfjoch_broker: Ordinary acquisition failures (receiver/writer/analysis problems, missed packets, writer disconnect) now return to the Idle state with an Error-severity message, so a run can be retried without an expensive re-initialisation; only failures that leave the detector in an undefined state (new JFJochCriticalException, e.g. PCIe/FPGA faults) go to the Error state and force re-initialisation.
* jfjoch_broker: A synchronous /start now reports its failure to the HTTP caller instead of returning HTTP 200, and an incomplete or truncated dataset (missing packets, writer disconnect) is reported as an error rather than a "reduce frame rate" warning.
* jfjoch_broker: Drop uncollected placeholder rows (number = -1) from the scan_result REST endpoint.
* jfjoch_broker: Fix the inverted per-image compression ratio reported by the Lite receiver (was compressed/uncompressed instead of uncompressed/compressed).
* jfjoch_broker: Bragg integration adds a quantization-noise variance floor with a box-sum fallback, and treats the type-maximum marker as an invalid pixel for unsigned image types.
* jfjoch_writer: Detect file-overwrite conflicts at start for back-channel transports, and reset the writer when end-of-collection finalisation fails.
* jfjoch_viewer: Preview overlays follow the geometry (resolution/ROI arcs, true beam centre, predictions, coral secondary-lattice spots, legend), add save-as-JPEG, and fix an HTTP live-follow memory leak.
* Frontend: Improved aesthetics and usability, and added in-browser pixel-mask and JUNGFRAU-pedestal visualisation.
* CI: Name the Windows installer jfjoch-viewer-* instead of jfjoch-*.Reviewed-on: #67

Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-07-11 07:19:11 +02:00

124 lines
3.8 KiB
C++

// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include "DectrisDetectorWrapper.h"
DetectorState DectrisDetectorWrapper::GetState() const {
if (!simplon)
return DetectorState::NOT_CONNECTED;
SimplonState simplon_state;
try {
simplon_state = simplon->GetState();
} catch (const JFJochException &e) {
return DetectorState::NOT_CONNECTED;
}
switch (simplon_state) {
case SimplonState::Ready:
return DetectorState::WAITING;
case SimplonState::Initialize:
case SimplonState::Configure:
case SimplonState::Acquire:
case SimplonState::Test:
return DetectorState::BUSY;
case SimplonState::Idle:
return DetectorState::IDLE;
default:
case SimplonState::Error:
case SimplonState::Na:
return DetectorState::ERROR;
}
}
void DectrisDetectorWrapper::CheckBusy() {
switch(GetState()) {
case DetectorState::BUSY:
case DetectorState::WAITING:
throw JFJochException(JFJochExceptionCategory::Detector,
"Detector busy");
case DetectorState::NOT_CONNECTED:
throw JFJochException(JFJochExceptionCategory::Detector,
"Detector not connected");
default:
break;
}
}
void DectrisDetectorWrapper::CheckBusyOrError() {
switch(GetState()) {
case DetectorState::ERROR:
throw JFJochCriticalException("Detector in error state");
case DetectorState::BUSY:
case DetectorState::WAITING:
throw JFJochException(JFJochExceptionCategory::Detector,
"Detector busy");
case DetectorState::NOT_CONNECTED:
throw JFJochException(JFJochExceptionCategory::Detector,
"Detector not connected");
default:
break;
}
}
void DectrisDetectorWrapper::Initialize(DiffractionExperiment &experiment,
const std::vector<AcquisitionDeviceNetConfig> &net_config) {
if (experiment.GetDetectorType() != DetectorType::DECTRIS)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"DectrisDetectorWrapper needs DECTRIS detector");
if (experiment.GetDetectorModuleHostname().empty()) {
simplon.reset();
return;
}
if (experiment.GetDetectorModuleHostname().size() != 1)
throw JFJochException(JFJochExceptionCategory::Detector,
"DectrisDetectorWrapper needs DECTRIS detector");
simplon = std::make_unique<DectrisSimplonClient>(experiment.GetDetectorSetup().GetDetectorModuleHostname()[0]);
CheckBusy();
simplon->InitializeDetector(experiment.Detector());
}
void DectrisDetectorWrapper::Configure(const DiffractionExperiment &experiment) {
CheckBusyOrError();
if (simplon)
simplon->ConfigureDetector(experiment);
}
void DectrisDetectorWrapper::Start(const DiffractionExperiment &experiment) {
CheckBusyOrError();
if (simplon)
simplon->StartAcquisition(experiment);
}
void DectrisDetectorWrapper::Stop() {
if (simplon)
simplon->EndAcquisitionFinished();
}
void DectrisDetectorWrapper::Trigger() {
if (simplon)
simplon->TriggerAcquisition();
}
void DectrisDetectorWrapper::Deactivate() {
CheckBusyOrError();
}
DetectorStatus DectrisDetectorWrapper::GetStatus() const {
if (!simplon)
return {.detector_state = DetectorState::NOT_CONNECTED};
return {
.detector_state = GetState()
};
}
void DectrisDetectorWrapper::LoadPixelMask(PixelMask &mask) {
if (simplon)
mask.LoadDECTRISBadPixelMask(simplon->GetPixelMask());
}