9434878c92
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m46s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 14m27s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 15m5s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 15m1s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 15m7s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 15m6s
Build Packages / build:rpm (rocky8) (push) Successful in 13m25s
Build Packages / XDS test (neggia plugin) (push) Successful in 9m46s
Build Packages / XDS test (durin plugin) (push) Successful in 10m14s
Build Packages / Generate python client (push) Successful in 16s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (rocky9) (push) Successful in 13m1s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 11m33s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 10m45s
Build Packages / Build documentation (push) Successful in 47s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 12m17s
Build Packages / DIALS test (push) Successful in 13m39s
Build Packages / Unit tests (push) Failing after 58m55s
Complete the image/metadata decoupling. JFJochHDF5Reader is now a thin JFJochReader
facade composing one shared HDF5ImageSource (raw pixels) with a name->HDF5MetadataSource
map and an active selection ("snapshots").
- HDF5MetadataSource owns one master file: dataset-level parse (Open, ex-ReadFile),
per-image metadata (FillPerImage, ex-LoadImage_i), ReadSpots/ReadReflections/
ReadCalibration, and the master-first helpers. It locates per-image metadata either via
the shared image source (original file: metadata co-located with pixels) or in its own
master at the global index (integrated _process.h5 snapshot) - so switching snapshots
never reloads pixels.
- Facade adds RegisterSnapshot/SetActiveSnapshot/SnapshotNames/ActiveSnapshot; ReadFile
registers the original as "Original". All existing JFJochReader callers are unchanged.
- The global hdf5_mutex is taken once in the facade; the sources assume it is held.
Adds JFJochReader_Snapshots test (original _master.h5 + a reprocessing _process.h5 over
the same images: pixels stay from the original, metadata follows the active snapshot).
Verified: tests/jfjoch_test [HDF5] (80 cases / 1810 assertions), plus jfjoch_process/
azint/extract_hkl/scale and jfjoch_viewer all build against the refactored reader.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
181 lines
6.6 KiB
C++
181 lines
6.6 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "JFJochHDF5Reader.h"
|
|
#include "../common/JFJochException.h"
|
|
|
|
void JFJochHDF5Reader::ReadFile(const std::string &filename) {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
image_source_.Clear();
|
|
snapshots_.clear();
|
|
active_metadata_.reset();
|
|
active_snapshot_.clear();
|
|
number_of_images = 0;
|
|
try {
|
|
auto metadata = std::make_shared<HDF5MetadataSource>();
|
|
auto open_result = metadata->Open(filename, default_experiment);
|
|
|
|
image_source_.Configure(std::move(open_result.image_layout));
|
|
// Original file: per-image metadata is co-located with the pixels.
|
|
metadata->UseImageSourceForMetadata(&image_source_);
|
|
number_of_images = open_result.number_of_images;
|
|
|
|
snapshots_["Original"] = metadata;
|
|
active_metadata_ = metadata;
|
|
active_snapshot_ = "Original";
|
|
SetStartMessage(metadata->Dataset());
|
|
} catch (const std::exception &e) {
|
|
image_source_.Clear();
|
|
snapshots_.clear();
|
|
active_metadata_.reset();
|
|
active_snapshot_.clear();
|
|
number_of_images = 0;
|
|
SetStartMessage({});
|
|
throw;
|
|
}
|
|
}
|
|
|
|
uint64_t JFJochHDF5Reader::GetNumberOfImages() const {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
return number_of_images;
|
|
}
|
|
|
|
void JFJochHDF5Reader::Close() {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
image_source_.Clear();
|
|
snapshots_.clear();
|
|
active_metadata_.reset();
|
|
active_snapshot_.clear();
|
|
number_of_images = 0;
|
|
SetStartMessage({});
|
|
}
|
|
|
|
HDF5ImageLocator::Location JFJochHDF5Reader::GetImageLocation(int64_t image_number) const {
|
|
if (image_number >= static_cast<int64_t>(number_of_images) || image_number < 0)
|
|
throw JFJochException(JFJochExceptionCategory::HDF5, "Image out of bounds");
|
|
return image_source_.Resolve(image_number);
|
|
}
|
|
|
|
std::shared_ptr<JFJochReaderRawImage> JFJochHDF5Reader::GetRawImage(int64_t image_number) {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
|
|
if (!active_metadata_)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Cannot load image if file not loaded");
|
|
|
|
auto loc = GetImageLocation(image_number);
|
|
auto ret = std::make_shared<JFJochReaderRawImage>();
|
|
ret->image = image_source_.ReadImageAt(ret->image_buffer, loc);
|
|
return ret;
|
|
}
|
|
|
|
bool JFJochHDF5Reader::LoadImage_i(std::shared_ptr<JFJochReaderDataset> &dataset,
|
|
DataMessage &message,
|
|
std::vector<uint8_t> &buffer,
|
|
int64_t image_number,
|
|
bool update_dataset) {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
(void) update_dataset;
|
|
|
|
if (!dataset)
|
|
return false;
|
|
if (!active_metadata_)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Cannot load image if file not loaded");
|
|
|
|
// Pixels from the shared image source, per-image metadata from the active snapshot.
|
|
auto loc = GetImageLocation(image_number);
|
|
message.image = image_source_.ReadImageAt(buffer, loc);
|
|
message.number = image_number;
|
|
active_metadata_->FillPerImage(message, image_number, dataset);
|
|
return true;
|
|
}
|
|
|
|
std::vector<HDF5DataSourceMessage> JFJochHDF5Reader::GetHDF5DataSource(uint64_t first_image,
|
|
std::optional<uint64_t> image_count) const {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
|
|
if (!active_metadata_)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Cannot generate HDF5 source mapping if file not loaded");
|
|
|
|
return image_source_.GetSourceMapping(first_image, image_count, number_of_images);
|
|
}
|
|
|
|
std::vector<IntegrationOutcome> JFJochHDF5Reader::ReadReflections(size_t start_image,
|
|
std::optional<size_t> end_image) const {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
|
|
if (!active_metadata_)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Cannot read reflections if file not loaded");
|
|
|
|
return active_metadata_->ReadReflections(start_image, end_image);
|
|
}
|
|
|
|
std::vector<SpotToSave> JFJochHDF5Reader::ReadSpots(int64_t image) const {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
|
|
if (!active_metadata_)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Cannot read spots if file not loaded");
|
|
|
|
return active_metadata_->ReadSpots(image);
|
|
}
|
|
|
|
CompressedImage JFJochHDF5Reader::ReadCalibration(std::vector<uint8_t> &tmp, const std::string &name) const {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
|
|
if (!active_metadata_)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Master file not loaded");
|
|
|
|
return active_metadata_->ReadCalibration(tmp, name);
|
|
}
|
|
|
|
void JFJochHDF5Reader::RegisterSnapshot(const std::string &name, const std::string &master_path) {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
|
|
if (!active_metadata_)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Open a dataset before registering a snapshot");
|
|
|
|
auto metadata = std::make_shared<HDF5MetadataSource>();
|
|
auto open_result = metadata->Open(master_path, default_experiment);
|
|
|
|
if (open_result.number_of_images != number_of_images)
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
|
|
"Snapshot image count does not match the open dataset");
|
|
|
|
// Snapshot pixels come from the existing image source; its own (integrated) master holds the
|
|
// per-image metadata at the global index.
|
|
metadata->UseImageSourceForMetadata(nullptr);
|
|
snapshots_[name] = metadata;
|
|
}
|
|
|
|
void JFJochHDF5Reader::SetActiveSnapshot(const std::string &name) {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
|
|
auto it = snapshots_.find(name);
|
|
if (it == snapshots_.end())
|
|
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Unknown snapshot: " + name);
|
|
|
|
active_metadata_ = it->second;
|
|
active_snapshot_ = name;
|
|
SetStartMessage(active_metadata_->Dataset());
|
|
}
|
|
|
|
std::vector<std::string> JFJochHDF5Reader::SnapshotNames() const {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
|
|
std::vector<std::string> names;
|
|
names.reserve(snapshots_.size());
|
|
for (const auto &[name, _]: snapshots_)
|
|
names.push_back(name);
|
|
return names;
|
|
}
|
|
|
|
std::string JFJochHDF5Reader::ActiveSnapshot() const {
|
|
std::unique_lock ul(hdf5_mutex);
|
|
return active_snapshot_;
|
|
}
|