leonarski_f
23d27f30c4
Decouple the raw-pixel side of JFJochHDF5Reader from the rest as the first step toward swappable per-dataset metadata snapshots. - HDF5ImageLocator: single owner of the legacy/VDS/contiguous layout resolution plus a persistent open-file cache, replacing the four duplicated resolvers (GetImageLocation, ReadSpots, ReadReflections) and their per-call file caches. Also hosts the source-mapping logic (former GetHDF5DataSource body). - HDF5ImageSource: raw-pixel reading (locator + LoadImageDataset); the part whose links to files stay fixed while the metadata master may change. - JFJochHDF5Reader keeps a thin GetImageLocation/GetRawImage/GetHDF5DataSource that delegate to image_source_; the six layout members are gone, parsed into a local Layout handed to the source at the end of ReadFile. Cache cleared on Close(). Verified: tests/jfjoch_test [HDF5] (79 cases / 1775 assertions), and jfjoch_process/azint/extract_hkl/scale relink unchanged. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
37 lines
1.5 KiB
C++
37 lines
1.5 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <cstdint>
|
|
#include <optional>
|
|
#include <vector>
|
|
|
|
#include "HDF5ImageLocator.h"
|
|
#include "../common/CompressedImage.h"
|
|
|
|
// Raw-pixel side of the reader. Turns a global image number into a CompressedImage, using
|
|
// HDF5ImageLocator to find the file (with its open-file cache). This is the part whose "links
|
|
// to files stay" constant: switching which master the per-image metadata is read from never
|
|
// touches it. Caller must hold the global hdf5_mutex (HDF5 is not thread-safe).
|
|
class HDF5ImageSource {
|
|
public:
|
|
void Configure(HDF5ImageLocator::Layout layout);
|
|
void Clear();
|
|
|
|
// Where image `global` physically lives. Also used by the metadata source to find the data
|
|
// file that holds a legacy/VDS image's per-image metadata.
|
|
HDF5ImageLocator::Location Resolve(int64_t global) const;
|
|
|
|
// Read the pixels at a resolved location into a CompressedImage backed by `buffer`.
|
|
CompressedImage ReadImageAt(std::vector<uint8_t> &buffer, const HDF5ImageLocator::Location &loc) const;
|
|
|
|
std::vector<HDF5DataSourceMessage> GetSourceMapping(uint64_t first_image,
|
|
std::optional<uint64_t> image_count,
|
|
uint64_t total_images) const;
|
|
|
|
private:
|
|
HDF5ImageLocator locator_;
|
|
static CompressedImage LoadImageDataset(std::vector<uint8_t> &tmp, HDF5Object &file, hsize_t number);
|
|
};
|