leonarski_f
d6389e12da
Build Packages / Unit tests (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 15m31s
Build Packages / build:viewer-tgz:cpu (push) Successful in 5m46s
Build Packages / build:viewer-tgz:cuda (push) Successful in 6m9s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m25s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m21s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 9m41s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 9m18s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 10m26s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m33s
Build Packages / build:rpm (rocky8) (push) Successful in 10m32s
Build Packages / build:rpm (rocky9) (push) Successful in 12m23s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m50s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m12s
Build Packages / DIALS test (push) Successful in 12m6s
Build Packages / XDS test (durin plugin) (push) Successful in 8m15s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m12s
Build Packages / XDS test (neggia plugin) (push) Successful in 5m35s
Build Packages / Generate python client (push) Successful in 27s
Build Packages / Build documentation (push) Successful in 54s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:cuda (push) Successful in 12m37s
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. * jfjoch_process: Major rotation (rot3d) data processing overhaul - robust profile-fit integration, Cauchy-loss scaling with optional absorption surface, de-novo indexing and space-group/centering determination fixes, and merging statistics + ISa in the mmCIF output. * jfjoch_process: Add EXPERIMENTAL ice-ring detection (--detect-ice-rings) that excludes ice reflections from scaling. * Compression: Add BSHUF_ZSTD_RLE_HUFF, make compression size-aware (drop frames that don't fit rather than aborting), and add the jfjoch_recompress tool. * jfjoch_viewer: Report "Multiple lattices detected" and grey out "Analyze dataset" on a live connection. * jfjoch_broker: Write smargon chi/phi goniometer positions to NXmx; read sensor thickness/material from HDF5 metadata. * CI: Build Windows (CUDA and non-CUDA) installers.Reviewed-on: #66 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
80 lines
2.6 KiB
C++
80 lines
2.6 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 <optional>
|
|
#include <vector>
|
|
#include <map>
|
|
|
|
#include "../common/DiffractionGeometry.h"
|
|
#include "../common/DiffractionExperiment.h"
|
|
#include "../common/PixelMask.h"
|
|
#include "../common/AzimuthalIntegrationMapping.h"
|
|
|
|
struct JFJochReaderDataset {
|
|
std::string arm_date;
|
|
|
|
DiffractionExperiment experiment;
|
|
PixelMask pixel_mask;
|
|
|
|
std::optional<int64_t> error_value;
|
|
|
|
std::string jfjoch_release;
|
|
|
|
std::vector<float> az_int_bin_to_q;
|
|
std::vector<float> az_int_bin_to_phi;
|
|
size_t azimuthal_bins = 0;
|
|
size_t q_bins = 0;
|
|
|
|
std::vector<float> spot_count;
|
|
std::vector<float> spot_count_indexed;
|
|
std::vector<float> spot_count_low_res;
|
|
std::vector<float> spot_count_ice_rings;
|
|
|
|
std::vector<float> indexing_result;
|
|
std::vector<float> indexing_lattice_count;
|
|
std::vector<float> bkg_estimate;
|
|
std::vector<float> ice_ring_score;
|
|
std::vector<float> resolution_estimate;
|
|
std::vector<float> efficiency;
|
|
std::vector<float> profile_radius;
|
|
std::vector<float> mosaicity_deg;
|
|
std::vector<float> b_factor;
|
|
std::vector<float> integrated_reflections;
|
|
std::vector<float> image_scale_factor;
|
|
std::vector<float> image_scale_cc;
|
|
std::vector<float> image_scale_b;
|
|
std::vector<int64_t> max_value;
|
|
|
|
// Maps this dataset's image index -> the original/collected image number it came from.
|
|
// Empty means identity (image i == original image i). Lets a dataset be a subset (or strided
|
|
// selection) of the truly collected images: reprocessing snapshots over a sub-range, and (in
|
|
// future) a main dataset that was filtered on-the-fly during collection.
|
|
std::vector<int> source_image_number;
|
|
|
|
std::vector<std::string> roi;
|
|
std::vector<std::vector<int64_t>> roi_sum;
|
|
std::vector<std::vector<int64_t>> roi_sum_sq;
|
|
std::vector<std::vector<int64_t>> roi_max;
|
|
std::vector<std::vector<int64_t>> roi_npixel;
|
|
std::vector<std::vector<float>> roi_x;
|
|
std::vector<std::vector<float>> roi_y;
|
|
|
|
// ROI definitions stored in the master file. The logical definitions populate
|
|
// experiment.ROI() (they re-derive with the current geometry); roi_map is the
|
|
// per-pixel bitmask as written (constant footprint), with roi_bit_index mapping
|
|
// each ROI name to its bit.
|
|
std::vector<uint16_t> roi_map;
|
|
std::map<std::string, uint16_t> roi_bit_index;
|
|
|
|
std::vector<std::string> calibration_data;
|
|
|
|
JFJochReaderDataset() = default;
|
|
JFJochReaderDataset(const JFJochReaderDataset &other) = default;
|
|
};
|
|
|
|
|
|
|