Build Packages / Unit tests (push) Successful in 1h32m35s
Build Packages / build:windows:cuda (push) Successful in 18m0s
Build Packages / build:viewer-tgz:cpu (push) Successful in 7m37s
Build Packages / build:viewer-tgz:cuda (push) Successful in 8m55s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 14m13s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 14m11s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 14m35s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m57s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m23s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 12m45s
Build Packages / build:rpm (rocky8) (push) Successful in 11m39s
Build Packages / build:rpm (rocky9) (push) Successful in 14m0s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m42s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 12m38s
Build Packages / DIALS test (push) Successful in 14m55s
Build Packages / XDS test (durin plugin) (push) Successful in 7m11s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m7s
Build Packages / XDS test (neggia plugin) (push) Successful in 8m34s
Build Packages / Generate python client (push) Successful in 28s
Build Packages / Build documentation (push) Successful in 1m3s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 9m55s
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. * Analysis: The azimuthal-integration solid-angle correction now follows the incidence angle to the detector normal (`cos^3` of that angle) instead of `cos^3(2*theta)`, so it is correct for a tilted detector and matches PyFAI `solidAngleArray` and MAX IV azint (unchanged for an untilted detector). Crystal geometry refinement (`XtalOptimizer`) no longer silently ignores an imported PONI `rot3` (rotation about the beam): it is applied as a fixed rotation in the residual so refinement stays consistent with the rest of the pipeline. Polarization and azimuthal binning already honoured `rot3` through the full PONI rotation. * jfjoch_viewer: Open datasets on the WSL2/UNC filesystem (paths starting `\\`); write processing outputs next to the input file, with a Browse button and independent `_process.h5` / merged `.mtz`/`.cif` toggles; and show the determined space group in the merge-statistics window. * rugnux: Accept an absolute `-o` output prefix in offline processing. * Packaging: The self-contained Linux viewer `.tgz` now bundles cuFFT, so it runs without a system CUDA toolkit (`.deb`/`.rpm` are unchanged, distro-managed). * Docs: Bring the analysis references up to date with the code. `docs/CPU_DATA_ANALYSIS.md` now reflects the unified profile-fit Bragg integration engine, multi-lattice indexing, azimuthal phi binning, the radial parallax/bandwidth profile with sub-pixel centring, the rot3d capture-fraction handling and the automatic CC1/2 resolution cutoff, and drops the descriptions of features that were never implemented (French-Wilson amplitudes, the still excitation-error partiality model); `docs/RUGNUX.md` documents the new `--resolution-cutoff`/`--resolution-cc-target`/`--resolution-shells`, `--min-captured-fraction`, `--mosaicity`, `--reference-column`, the azimuthal correction toggles and the geometry-override options, and corrects the `-N` default. The outdated in-source design notes (ICE_RING_DETECTION, BRAGG_INTEGRATION_ENGINE, NEXTGEN_INTEGRATOR) are removed.Reviewed-on: #68 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
74 lines
3.0 KiB
C++
74 lines
3.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 <map>
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "JFJochReader.h"
|
|
#include "JFJochReaderSpots.h"
|
|
#include "HDF5ImageSource.h"
|
|
#include "HDF5MetadataSource.h"
|
|
#include "../writer/HDF5Objects.h"
|
|
#include "../image_analysis/IntegrationOutcome.h"
|
|
|
|
// Composes one shared raw-image source with one or more metadata sources ("snapshots") over the
|
|
// same images: the original _master.h5 plus optional reprocessing _process.h5 results. The active
|
|
// snapshot supplies the dataset and per-image metadata; the image source always supplies pixels,
|
|
// so switching snapshots never reloads image data.
|
|
class JFJochHDF5Reader : public JFJochReader {
|
|
HDF5ImageSource image_source_;
|
|
std::map<std::string, std::shared_ptr<HDF5MetadataSource> > snapshots_;
|
|
std::shared_ptr<HDF5MetadataSource> active_metadata_;
|
|
std::string active_snapshot_;
|
|
size_t number_of_images = 0;
|
|
|
|
bool LoadImage_i(std::shared_ptr<JFJochReaderDataset> &dataset,
|
|
DataMessage &message,
|
|
std::vector<uint8_t> &buffer,
|
|
int64_t image_number,
|
|
bool update_dataset) override;
|
|
|
|
HDF5ImageLocator::Location GetImageLocation(int64_t image_number) const;
|
|
|
|
public:
|
|
~JFJochHDF5Reader() override = default;
|
|
|
|
void ReadFile(const std::string &filename);
|
|
|
|
uint64_t GetNumberOfImages() const override;
|
|
|
|
void Close() override;
|
|
|
|
std::vector<HDF5DataSourceMessage> GetHDF5DataSource(
|
|
uint64_t first_image = 0,
|
|
std::optional<uint64_t> image_count = {}
|
|
) const;
|
|
|
|
std::vector<IntegrationOutcome> ReadReflections(size_t start_image = 0, std::optional<size_t> end_image = {}) const;
|
|
|
|
std::vector<SpotToSave> ReadSpots(int64_t image) const override;
|
|
// True if the loaded file stores spot-finding results; false for a plain DECTRIS dataset (no
|
|
// /entry/MX), so callers can find spots instead of reusing absent ones.
|
|
[[nodiscard]] bool HasStoredSpots() const;
|
|
|
|
CompressedImage ReadCalibration(std::vector<uint8_t> &tmp, const std::string &name) const;
|
|
|
|
std::shared_ptr<JFJochReaderRawImage> GetRawImage(int64_t image_number) override;
|
|
|
|
// Metadata snapshots over the same images. The original file is registered as "Original" on
|
|
// ReadFile and is the initial active snapshot; reprocessing results can be added later.
|
|
void RegisterSnapshot(const std::string &name, const std::string &master_path);
|
|
void RemoveSnapshot(const std::string &name); // "Original" cannot be removed
|
|
void SetActiveSnapshot(const std::string &name);
|
|
std::vector<std::string> SnapshotNames() const;
|
|
std::string ActiveSnapshot() const;
|
|
|
|
// All snapshot datasets (name -> dataset), for overlaying every run's plots at once.
|
|
std::vector<std::pair<std::string, std::shared_ptr<const JFJochReaderDataset>>> AllSnapshotDatasets() const;
|
|
};
|