Build Packages / Unit tests (push) Skipped
Build Packages / build:windows:cuda (push) Successful in 18m44s
Build Packages / build:viewer-tgz:cpu (push) Successful in 6m11s
Build Packages / build:viewer-tgz:cuda (push) Successful in 6m54s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m40s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m41s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 10m10s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 10m4s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 11m5s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 12m23s
Build Packages / build:rpm (rocky8) (push) Successful in 11m30s
Build Packages / build:rpm (rocky9) (push) Successful in 12m51s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m8s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m21s
Build Packages / DIALS test (push) Successful in 13m22s
Build Packages / XDS test (durin plugin) (push) Successful in 9m2s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m55s
Build Packages / XDS test (neggia plugin) (push) Successful in 5m57s
Build Packages / Generate python client (push) Successful in 23s
Build Packages / Build documentation (push) Successful in 57s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 10m24s
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: Add `--model model.pdb` - score the merged data against an atomic model and compute initial maps. It reports R-work/R-free (scaling the model to the observed amplitudes with an overall scale, an anisotropic B and a flat bulk solvent - the standard few-parameter model, so a batch of maps stays directly comparable) and writes 2Fo-Fc / Fo-Fc electron-density maps (CCP4) plus a map-coefficient MTZ. The structure itself is not refined; the model is only re-fractionalised into the data cell. * rugnux: The merged reflection output now carries French-Wilson amplitudes (|F| and its sigma) next to the intensities - MTZ `F`/`SIGF`, mmCIF `_refln.F_meas_au`, and the text HKL - computed with the correct centric/acentric Wilson prior and epsilon multiplicity, so a downstream program (e.g. phenix.refine) can refine against amplitudes. The intensity columns are unchanged. * rugnux: R-free test-set flags are now assigned deterministically and consistently across symmetry - a Bijvoet pair I(+)/I(-) is never split between the work and free sets, and the assignment is a reproducible per-hkl hash that depends only on the reflection index, so every dataset of one crystal form gets the same ~5% free set (what a multi-dataset campaign such as PanDDA needs). On small data the fraction is floored so the test set stays large enough for a stable R-free (~500 reflections, capped at 10%); it stays flat at 5% on ordinary data. When a reference MTZ carries a `FreeR_flag` column its test set is imported instead, letting a whole campaign inherit one shared free set. * rugnux: A reference MTZ (`--reference-mtz`) can now fix the space group and cell for rotation data too (previously rejected), without being used to scale - the rotation merge stays self-consistent. When the crystal has an indexing (merohedral) ambiguity - a lattice symmetry higher than its Laue symmetry, e.g. P3/P4/P6/C2 - the reference also resolves it: each candidate reindexing (identity plus the twin-law cosets of the metric symmetry) is scored by its intensity correlation against the reference and the data are re-merged in the best-correlating one. This is a metric-preserving relabelling of hkl (the cell is unchanged) and a no-op for a holohedral crystal such as lysozyme. * rugnux: `--model` validation now aligns the data to the model before scoring - the observed reflections are reindexed into the model's enantiomorph when the two differ only by hand (indistinguishable from merged intensities). A merohedral indexing ambiguity is resolved against the reference MTZ when one is given (so a whole campaign shares one indexing convention); only with a model and no reference does validation fall back to fitting each candidate reindexing and keeping the lowest R-free. * rugnux: De-novo symmetry - recover a genuine high-symmetry group whose data are imperfectly scaled. Such a merge's within-orbit chi² lands just past the self-consistency bound (each real symmetry step adds a little systematic scatter), right where a merohedral twin also lands, so the chi² ratio alone cannot separate them. The candidate is now rescued when the extra intensity-proportional systematic error it invokes stays small relative to the confirmed subgroup - a genuine symmetry step gains multiplicity without inflating the merge error model's b, whereas a twin forces non-equivalent reflections together and b balloons. Fixes cubic insulin (I23 instead of I222) with no change to any other crystal in the test battery, including the twins that must stay in their lower symmetry. * Docs: Document the French-Wilson amplitude estimation, R-free flagging, reference-based space-group/ambiguity resolution, and model-based validation/maps in CPU_DATA_ANALYSIS.md. * Frontend: The status-bar pill now shows a progress bar during detector calibration (previously only during measurement), and the calibration state and its button are labelled "Calibration"/"CALIBRATE" (the internal `Pedestal` state name is unchanged for back-compatibility).Reviewed-on: #70 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
399 lines
12 KiB
C++
399 lines
12 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <string>
|
|
#include <cstdint>
|
|
#include <map>
|
|
#include <vector>
|
|
#include <optional>
|
|
#include <cstring>
|
|
#include <stdexcept>
|
|
#include <nlohmann/json.hpp>
|
|
|
|
#include "CompressedImage.h"
|
|
#include "SpotToSave.h"
|
|
#include "UnitCell.h"
|
|
#include "GoniometerAxis.h"
|
|
#include "GridScanSettings.h"
|
|
#include "Reflection.h"
|
|
#include "CrystalLattice.h"
|
|
#include "IndexingSettings.h"
|
|
#include "XrayFluorescenceSpectrum.h"
|
|
#include "../gemmi_gph/gemmi/symmetry.hpp"
|
|
|
|
constexpr const uint64_t user_data_release = 6;
|
|
constexpr const uint64_t user_data_magic_number = 0x52320000UL | user_data_release;
|
|
|
|
enum class CBORImageType {START, END, IMAGE, CALIBRATION, METADATA, NONE};
|
|
|
|
enum class FileWriterFormat : int {
|
|
DataOnly = 0,
|
|
NXmxLegacy = 1,
|
|
NXmxVDS = 2,
|
|
NXmxIntegrated = 3,
|
|
// 4 (CBF) and 5 (TIFF) removed - only HDF5 is written now. The values are kept
|
|
// (deprecated) in the OpenAPI enum in broker/jfjoch_api.yaml for back compatibility.
|
|
NoFile = 6
|
|
};
|
|
|
|
struct ROIConfigBox {
|
|
int64_t xmin, xmax, ymin, ymax;
|
|
};
|
|
|
|
struct ROIConfigCircle {
|
|
double r, x, y;
|
|
};
|
|
|
|
struct ROIConfigAzim {
|
|
double qmin, qmax;
|
|
// Azimuthal-angle sector in degrees; phi_min == phi_max means full ring.
|
|
float phi_min, phi_max;
|
|
};
|
|
|
|
struct ROIConfig {
|
|
enum class ROIType {Box, Circle, Azim} type;
|
|
std::string name;
|
|
union {
|
|
ROIConfigBox box;
|
|
ROIConfigCircle circle;
|
|
ROIConfigAzim azim;
|
|
};
|
|
};
|
|
|
|
struct ROIMessage {
|
|
int64_t sum;
|
|
uint64_t sum_square;
|
|
int64_t max_count;
|
|
uint64_t pixels;
|
|
uint64_t pixels_masked; // only used in the viewer for now
|
|
int64_t x_weighted;
|
|
int64_t y_weighted;
|
|
};
|
|
|
|
struct LatticeMessage {
|
|
char centering;
|
|
int64_t niggli_class;
|
|
gemmi::CrystalSystem crystal_system;
|
|
};
|
|
|
|
struct SmargonPosition {
|
|
float phi_deg = 0;
|
|
float chi_deg = 0;
|
|
Coord chi_axis = {0, 0, 1};
|
|
Coord phi_axis = {1, 0, 0}; // Default omega axis
|
|
};
|
|
|
|
struct DataMessage {
|
|
int64_t number = INT64_MIN;
|
|
CompressedImage image;
|
|
|
|
std::optional<uint64_t> packets_expected;
|
|
std::optional<uint64_t> packets_received;
|
|
std::optional<float> image_collection_efficiency;
|
|
|
|
std::optional<float> processing_time_s;
|
|
std::optional<float> spot_finding_time_s;
|
|
std::optional<float> azint_time_s;
|
|
std::optional<float> indexing_time_s;
|
|
std::optional<float> refinement_time_s;
|
|
std::optional<float> bragg_prediction_time_s;
|
|
std::optional<float> integration_time_s;
|
|
std::optional<float> preprocessing_time_s;
|
|
std::optional<float> compression_time_s;
|
|
std::optional<float> index_analysis_time_s;
|
|
std::optional<float> image_scale_time_s;
|
|
|
|
std::vector<SpotToSave> spots;
|
|
std::optional<int64_t> spot_count;
|
|
std::optional<int64_t> spot_count_ice_rings;
|
|
std::optional<int64_t> spot_count_low_res;
|
|
|
|
std::vector<float> spot_plot_count;
|
|
std::vector<float> spot_plot_intensity;
|
|
std::vector<float> spot_plot_one_over_d_square;
|
|
|
|
std::vector<float> az_int_profile;
|
|
std::vector<float> az_int_profile_std;
|
|
std::vector<uint64_t> az_int_profile_count;
|
|
|
|
std::optional<float> bkg_estimate;
|
|
std::optional<float> ice_ring_score; // strongest ice ring over the smooth radial background (1 = none)
|
|
|
|
std::optional<bool> indexing_result;
|
|
std::optional<CrystalLattice> indexing_lattice;
|
|
std::vector<CrystalLattice> indexing_extra_lattices;
|
|
std::optional<int64_t> indexing_lattice_count;
|
|
std::optional<UnitCell> indexing_unit_cell;
|
|
std::optional<int64_t> spot_count_indexed;
|
|
|
|
std::optional<float> profile_radius;
|
|
std::optional<float> mosaicity_deg;
|
|
|
|
std::optional<float> b_factor;
|
|
|
|
std::vector<uint64_t> adu_histogram;
|
|
|
|
std::optional<int64_t> integrated_reflections;
|
|
|
|
uint64_t timestamp;
|
|
uint32_t timestamp_base;
|
|
|
|
uint32_t exptime;
|
|
uint32_t exptime_base;
|
|
|
|
std::string run_name;
|
|
uint64_t run_number;
|
|
|
|
std::optional<int64_t> pixel_sum;
|
|
std::optional<int64_t> saturated_pixel_count;
|
|
std::optional<int64_t> error_pixel_count;
|
|
std::optional<int64_t> strong_pixel_count;
|
|
std::optional<int64_t> min_viable_pixel_value;
|
|
std::optional<int64_t> max_viable_pixel_value;
|
|
std::optional<float> resolution_estimate;
|
|
|
|
nlohmann::json user_data;
|
|
|
|
std::optional<uint64_t> jf_info;
|
|
std::optional<uint64_t> receiver_aq_dev_delay;
|
|
std::optional<uint64_t> receiver_buf_available;
|
|
std::optional<uint64_t> receiver_buf_in_sending;
|
|
std::optional<uint64_t> receiver_buf_in_preparation;
|
|
std::optional<uint64_t> storage_cell;
|
|
|
|
std::optional<uint64_t> xfel_pulse_id;
|
|
std::optional<uint64_t> xfel_event_code;
|
|
|
|
std::map<std::string, ROIMessage> roi;
|
|
|
|
std::optional<int64_t> original_number;
|
|
std::vector<Reflection> reflections;
|
|
|
|
std::vector<float> integration_B_logI;
|
|
std::vector<float> integration_B_one_over_d_square;
|
|
|
|
std::vector<float> integration_Isigma;
|
|
std::vector<float> integration_Isigma_one_over_d_square;
|
|
|
|
std::optional<float> beam_corr_x;
|
|
std::optional<float> beam_corr_y;
|
|
|
|
std::optional<LatticeMessage> lattice_type;
|
|
|
|
std::optional<float> image_scale_factor;
|
|
std::optional<float> image_scale_cc;
|
|
std::optional<float> image_scale_mosaicity;
|
|
std::optional<float> image_scale_b_factor;
|
|
|
|
std::optional<float> compression_ratio;
|
|
};
|
|
|
|
struct HDF5DataSourceMessage {
|
|
std::string filename;
|
|
std::string dataset = "/entry/data/data";
|
|
|
|
uint64_t source_first_image = 0;
|
|
uint64_t virtual_first_image = 0;
|
|
uint64_t image_count = 0;
|
|
};
|
|
|
|
struct StartMessage {
|
|
float detector_distance;
|
|
float beam_center_x;
|
|
float beam_center_y;
|
|
|
|
uint64_t number_of_images;
|
|
|
|
std::optional<uint64_t> images_per_trigger;
|
|
|
|
uint64_t image_size_x;
|
|
uint64_t image_size_y;
|
|
uint64_t bit_depth_image; // user data
|
|
std::optional<uint64_t> bit_depth_readout;
|
|
bool pixel_signed; // user data
|
|
|
|
bool countrate_correction_enabled;
|
|
|
|
float incident_energy;
|
|
float incident_wavelength;
|
|
std::optional<float> incident_wavelength_spread; // NXmx incident_wavelength_spread: FWHM of dlambda (Angstrom)
|
|
|
|
float frame_time;
|
|
float count_time;
|
|
|
|
int64_t saturation_value;
|
|
std::optional<int64_t> error_value;
|
|
|
|
float pixel_size_x;
|
|
float pixel_size_y;
|
|
float sensor_thickness;
|
|
std::string sensor_material;
|
|
|
|
std::optional<UnitCell> unit_cell; // user data
|
|
std::optional<uint64_t> space_group_number; // user data
|
|
uint64_t max_spot_count; // user data
|
|
uint64_t max_extra_lattices = 0;
|
|
|
|
std::optional<uint64_t> storage_cell_number;
|
|
uint64_t storage_cell_delay_ns;
|
|
|
|
bool flatfield_enabled;
|
|
bool pixel_mask_enabled;
|
|
|
|
std::string arm_date;
|
|
|
|
std::string sample_name; // user data
|
|
std::string file_prefix; // user data
|
|
int64_t images_per_file = 1; // user data
|
|
|
|
std::vector<std::string> channels;
|
|
|
|
std::string detector_description;
|
|
std::string detector_serial_number;
|
|
std::string run_name;
|
|
uint64_t run_number;
|
|
|
|
std::vector<std::string> gain_file_names;
|
|
|
|
std::vector<ROIConfig> rois;
|
|
|
|
std::optional<GridScanSettings> grid_scan;
|
|
std::optional<GoniometerAxis> goniometer;
|
|
float detector_translation[3];
|
|
|
|
std::string source_type;
|
|
std::string source_name;
|
|
std::string instrument_name;
|
|
|
|
uint64_t summation;
|
|
|
|
std::vector<float> az_int_bin_to_q;
|
|
std::vector<float> az_int_bin_to_two_theta;
|
|
std::vector<float> az_int_bin_to_phi;
|
|
std::optional<uint64_t> az_int_q_bin_count;
|
|
std::optional<uint64_t> az_int_phi_bin_count;
|
|
std::vector<uint16_t> az_int_map;
|
|
|
|
std::map<std::string, std::vector<uint32_t>> pixel_mask;
|
|
|
|
// Per-pixel ROI bitmask (converted geometry), bit i set for ROI i in rois.
|
|
std::vector<uint16_t> roi_map;
|
|
|
|
std::map<std::string, float> threshold_energy;
|
|
|
|
std::optional<float> total_flux;
|
|
std::optional<float> attenuator_transmission;
|
|
|
|
std::optional<bool> write_master_file;
|
|
std::optional<bool> write_images;
|
|
|
|
nlohmann::json user_data;
|
|
|
|
std::optional<float> data_reduction_factor_serialmx;
|
|
std::string experiment_group;
|
|
|
|
std::string jfjoch_release;
|
|
|
|
std::optional<uint64_t> socket_number; // This is number of socket in ZeroMQ
|
|
std::string writer_notification_zmq_addr; // Socket to inform detector on writer done
|
|
|
|
std::optional<bool> jungfrau_conversion_enabled;
|
|
std::optional<float> jungfrau_conversion_factor;
|
|
std::optional<bool> geometry_transformation_enabled;
|
|
std::optional<std::string> summation_mode;
|
|
std::optional<bool> overwrite;
|
|
std::optional<FileWriterFormat> file_format;
|
|
std::optional<bool> xfel_pulse_id;
|
|
std::optional<float> ring_current_mA;
|
|
std::optional<float> sample_temperature_K;
|
|
|
|
IndexingAlgorithmEnum indexing_algorithm;
|
|
GeomRefinementAlgorithmEnum geom_refinement_algorithm;
|
|
|
|
std::optional<float> poni_rot1;
|
|
std::optional<float> poni_rot2;
|
|
std::optional<float> poni_rot3;
|
|
|
|
XrayFluorescenceSpectrum fluorescence_spectrum;
|
|
|
|
std::optional<bool> detect_ice_rings;
|
|
|
|
std::vector<HDF5DataSourceMessage> hdf5_source_data;
|
|
std::optional<std::string> master_suffix;
|
|
|
|
std::optional<SmargonPosition> smargon_position;
|
|
};
|
|
|
|
struct EndMessage {
|
|
uint64_t max_image_number; // Counting from 1, i.e. 0 = no images collected
|
|
std::optional<uint64_t> images_collected_count;
|
|
std::optional<uint64_t> images_sent_to_write_count;
|
|
std::optional<uint64_t> max_receiver_delay;
|
|
std::optional<float> efficiency;
|
|
std::optional<float> indexing_rate;
|
|
std::optional<float> bkg_estimate;
|
|
|
|
std::optional<std::string> end_date;
|
|
|
|
std::string run_name;
|
|
uint64_t run_number;
|
|
|
|
std::map<std::string, std::vector<float>> az_int_result;
|
|
std::map<std::string, std::vector<uint64_t>> adu_histogram;
|
|
uint64_t adu_histogram_bin_width;
|
|
|
|
std::optional<LatticeMessage> rotation_lattice_type;
|
|
std::optional<CrystalLattice> rotation_lattice;
|
|
std::vector<CrystalLattice> rotation_extra_lattices;
|
|
std::optional<UnitCell> unit_cell;
|
|
// Space group determined by the offline analysis (overrides the start message when writing the
|
|
// master, since it is only known after merging).
|
|
std::optional<uint64_t> space_group_number;
|
|
|
|
// Geometry refined by the offline analysis. When present these overwrite the master-file geometry
|
|
// at finalization (rugnux writes the refined values; the broker leaves them empty and keeps the
|
|
// user-provided StartMessage geometry). Beam centre in pixels, detector tilt (PONI rot1/2/3) in
|
|
// radians, rotation axis as a unit vector.
|
|
std::optional<float> refined_beam_center_x;
|
|
std::optional<float> refined_beam_center_y;
|
|
std::optional<float> refined_poni_rot1;
|
|
std::optional<float> refined_poni_rot2;
|
|
std::optional<float> refined_poni_rot3;
|
|
std::optional<Coord> refined_rotation_axis;
|
|
|
|
// Vectors with end result:
|
|
std::vector<float> data_collection_efficiency;
|
|
std::vector<int32_t> spot_count;
|
|
std::vector<int32_t> spot_count_ice_ring;
|
|
std::vector<int32_t> spot_count_low_res;
|
|
std::vector<int32_t> spot_count_indexed;
|
|
std::vector<uint8_t> image_indexed;
|
|
std::vector<int32_t> indexed_lattice_count;
|
|
std::vector<float> v_bkg_estimate;
|
|
std::vector<float> profile_radius;
|
|
std::vector<float> mosaicity;
|
|
std::vector<float> bFactor;
|
|
std::vector<float> resolution_estimate;
|
|
std::vector<int64_t> min_viable_pixel_value;
|
|
std::vector<int64_t> max_viable_pixel_value;
|
|
std::vector<int32_t> saturated_pixel_count;
|
|
std::vector<int32_t> error_pixel_count;
|
|
std::vector<int32_t> integrated_reflections;
|
|
std::vector<uint8_t> niggli_class;
|
|
std::vector<int64_t> pixel_sum;
|
|
|
|
std::vector<float> image_scale_factor;
|
|
std::vector<float> image_scale_cc;
|
|
std::vector<float> image_scale_b_factor;
|
|
std::vector<float> image_scale_mosaicity;
|
|
std::vector<float> ice_ring_score;
|
|
};
|
|
|
|
struct MetadataMessage {
|
|
std::string run_name;
|
|
uint64_t run_number;
|
|
std::vector<DataMessage> images;
|
|
};
|