Files
Jungfraujoch/reader/HDF5MetadataSource.h
T
leonarski_fandClaude Opus 4.8 0dfaf0a58a
Build Packages / build:windows:nocuda (push) Successful in 15m33s
Build Packages / build:windows:cuda (push) Successful in 17m48s
Build Packages / build:viewer-tgz:cpu (push) Successful in 6m23s
Build Packages / build:viewer-tgz:cuda (push) Successful in 6m53s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 10m12s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 10m35s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 10m51s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 8m47s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m30s
Build Packages / build:rpm (rocky8) (push) Successful in 10m18s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m5s
Build Packages / build:rpm (rocky9) (push) Successful in 11m5s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m40s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m14s
Build Packages / Generate python client (push) Successful in 15s
Build Packages / Build documentation (push) Successful in 50s
Build Packages / Create release (push) Skipped
Build Packages / XDS test (durin plugin) (push) Successful in 7m13s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 7m27s
Build Packages / XDS test (neggia plugin) (push) Successful in 6m46s
Build Packages / DIALS test (push) Successful in 10m59s
Build Packages / Unit tests (push) Successful in 1h50m3s
Build Packages / Unit tests (pull_request) Successful in 1h31m40s
Build Packages / build:windows:cuda (pull_request) Successful in 12m14s
Build Packages / build:viewer-tgz:cpu (pull_request) Successful in 6m16s
Build Packages / build:viewer-tgz:cuda (pull_request) Successful in 6m47s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 9m25s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 10m13s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 8m8s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 8m36s
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 10m10s
Build Packages / build:rpm (rocky9_sls9) (pull_request) Successful in 10m54s
Build Packages / build:rpm (rocky8) (pull_request) Successful in 9m56s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 10m53s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 9m46s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 10m21s
Build Packages / DIALS test (pull_request) Successful in 12m15s
Build Packages / XDS test (durin plugin) (pull_request) Successful in 7m10s
Build Packages / XDS test (JFJoch plugin) (pull_request) Successful in 7m40s
Build Packages / XDS test (neggia plugin) (pull_request) Successful in 7m1s
Build Packages / Generate python client (pull_request) Successful in 25s
Build Packages / Build documentation (pull_request) Successful in 49s
Build Packages / Create release (pull_request) Skipped
Build Packages / build:windows:nocuda (pull_request) Successful in 16m1s
rugnux: don't reuse absent spots on plain DECTRIS datasets
reuse_rotation_spots defaults on, so the two-pass first phase read stored spots
from /entry/MX. A standard DECTRIS dataset has no spot-finding results, so every
frame came back with zero spots and indexing failed ("Two-pass rotation indexing
failed") instead of falling back to finding spots.

Add HasStoredSpots() to the reader (HDF5MetadataSource::HasSpots): spots exist if
/entry/MX/nPeaks is present in the master (integrated _process.h5) or the per-image
data file (VDS/legacy) - the same master-first-then-source path ReadSpots uses.
Rugnux reuses stored spots only when they exist, otherwise it runs spot finding
(and logs it); --redo-rotation-spots already forced finding.

Verified: a true no-/entry/MX rotation dataset fails on the old code and indexes
(P21) on the new; all jungfraujoch files (spots in master or in data files) still
reuse unchanged.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-11 22:56:28 +02:00

80 lines
3.9 KiB
C++

// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include <memory>
#include <optional>
#include <string>
#include <unordered_map>
#include <vector>
#include "JFJochReaderDataset.h"
#include "HDF5ImageSource.h"
#include "../common/JFJochMessages.h"
#include "../common/SpotToSave.h"
#include "../common/GoniometerAxis.h"
#include "../common/DiffractionExperiment.h"
#include "../common/DiffractionGeometry.h"
#include "../image_analysis/IntegrationOutcome.h"
// Metadata side of the reader: everything read from one master file that is NOT raw pixels -
// dataset-level metadata (geometry, mask, ROI definitions, azimuthal mapping, the per-image plot
// arrays) and per-image metadata (spots, reflections, MX scalars, azimuthal profile, lattice).
//
// This is the swappable part: a dataset can have several metadata sources over the same images
// (the original _master.h5 plus reprocessing _process.h5 snapshots). Per-image metadata is
// located either through the shared image source (original file: metadata sits in the same files
// as the pixels) or in this master at the global index (integrated _process.h5 snapshot).
//
// HDF5 is not thread-safe; all calls must be made with the global hdf5_mutex held by the caller.
class HDF5MetadataSource {
public:
struct OpenResult {
HDF5ImageLocator::Layout image_layout; // layout implied by this master (for the image source)
uint64_t number_of_images = 0;
};
// Parse a master file's dataset-level metadata into a JFJochReaderDataset. default_experiment
// seeds the dataset's experiment. Returns the image layout it implies; the caller decides
// whether to use it to configure the shared image source.
OpenResult Open(const std::string &filename, const DiffractionExperiment &default_experiment);
// How per-image metadata is located: with image_source set, metadata is co-located with the
// pixels (original file); when null it lives in this master at the global index.
void UseImageSourceForMetadata(const HDF5ImageSource *image_source) { image_source_ = image_source; }
std::shared_ptr<JFJochReaderDataset> Dataset() const { return dataset_; }
uint64_t NumberOfImages() const { return number_of_images; }
// Per-image metadata (spots, azimuthal profile, MX scalars, lattice, reflections) into msg.
void FillPerImage(DataMessage &message, int64_t image_number,
const std::shared_ptr<const JFJochReaderDataset> &dataset) const;
std::vector<SpotToSave> ReadSpots(int64_t image) const;
// True if the file stores spot-finding results (/entry/MX); a plain DECTRIS file has none.
[[nodiscard]] bool HasSpots() const;
std::vector<IntegrationOutcome> ReadReflections(size_t start_image, std::optional<size_t> end_image) const;
CompressedImage ReadCalibration(std::vector<uint8_t> &tmp, const std::string &name) const;
private:
std::shared_ptr<HDF5ReadOnlyFile> master_file;
std::string master_filename;
std::shared_ptr<JFJochReaderDataset> dataset_;
DiffractionGeometry cached_geom;
uint64_t number_of_images = 0;
const HDF5ImageSource *image_source_ = nullptr;
// Inverse of dataset_->source_image_number (original image number -> local index in this
// master). Empty for a 1:1 source; populated when this metadata covers a subset of images.
std::unordered_map<int64_t, int64_t> image_to_local_;
// Translate a global/original image number to the local index in this metadata source, or
// nullopt if this source does not cover that image. Identity for a 1:1 source.
std::optional<int64_t> ToLocalIndex(int64_t image_number) const;
HDF5ImageLocator::Location ResolveMeta(int64_t global) const;
std::optional<GoniometerAxis> ReadAxis(HDF5Object *file, const std::string &name);
void ReadROIMetadata(HDF5ReadOnlyFile &file, JFJochReaderDataset &dataset) const;
};