Merge rc178-review into rc178: raw chunk-read handles bounded, saturation log names its source
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 14m48s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 4m58s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 9m14s
Build Packages / Generate python client (push) Successful in 11s
Build Packages / Build documentation (push) Successful in 45s
Build Packages / Create release (push) Successful in 8s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Failing after 3m50s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 17m53s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 21m43s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 25m34s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 25m43s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 26m24s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 26m34s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 26m44s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Failing after 5m39s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 27m48s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 25m55s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 23m41s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 27m14s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 28m54s
Build Packages / Unit tests (push) Successful in 1h55m32s
Build Packages / Validation Battery (push) Successful in 35m54s
Build Packages / build:portable:linux-x86_64:nocuda (push) Successful in 14m48s
Build Packages / build:portable:macos-arm64:nocuda (push) Successful in 4m58s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 9m14s
Build Packages / Generate python client (push) Successful in 11s
Build Packages / Build documentation (push) Successful in 45s
Build Packages / Create release (push) Successful in 8s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Failing after 3m50s
Build Packages / build:portable:linux-x86_64:cuda (push) Successful in 17m53s
Build Packages / build:portable:windows-x86_64:nocuda (push) Successful in 21m43s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 25m34s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 25m43s
Build Packages / build:portable:windows-x86_64:cuda (push) Successful in 26m24s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 26m34s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 26m44s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Failing after 5m39s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 27m48s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 25m55s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 23m41s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 27m14s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 28m54s
Build Packages / Unit tests (push) Successful in 1h55m32s
Build Packages / Validation Battery (push) Successful in 35m54s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015CeEGgpKdfkCTJb3YNMJcu
This commit is contained in:
commit
f5d0d4ea5e
3 files changed
+11
-2
No files matched your search
@@ -84,6 +84,7 @@ std::shared_ptr<const HDF5ImageSource::RawFile> JFJochXFELReader::RawFileAt(size
|
||||
if (raw_files_.size() != files_.size()) {
|
||||
raw_files_.assign(files_.size(), nullptr);
|
||||
user_block_.assign(files_.size(), 0);
|
||||
raw_order_.clear();
|
||||
}
|
||||
if (!raw_files_[file]) {
|
||||
const hid_t fcpl = H5Fget_create_plist(FileAt(file).GetID());
|
||||
@@ -97,6 +98,11 @@ std::shared_ptr<const HDF5ImageSource::RawFile> JFJochXFELReader::RawFileAt(size
|
||||
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid, "Cannot open " + files_[file]);
|
||||
raw_files_[file] = raw;
|
||||
user_block_[file] = user_block;
|
||||
raw_order_.push_back(file);
|
||||
if (raw_order_.size() > MAX_OPEN_FILES) {
|
||||
raw_files_[raw_order_.front()].reset();
|
||||
raw_order_.erase(raw_order_.begin());
|
||||
}
|
||||
}
|
||||
return raw_files_[file];
|
||||
}
|
||||
@@ -718,6 +724,7 @@ void JFJochXFELReader::Close() {
|
||||
open_files_.clear();
|
||||
raw_files_.clear();
|
||||
user_block_.clear();
|
||||
raw_order_.clear();
|
||||
files_.clear();
|
||||
frames_.clear();
|
||||
dataset_.reset();
|
||||
|
||||
@@ -84,9 +84,11 @@ class JFJochXFELReader : public JFJochReader {
|
||||
};
|
||||
Layout layout_;
|
||||
// Positional-read handles on the files, opened as first needed (under hdf5_mutex), with the size of
|
||||
// each file's user block, which HDF5 chunk addresses count from.
|
||||
// each file's user block, which HDF5 chunk addresses count from. Like open_files_, only the most
|
||||
// recently used MAX_OPEN_FILES are held (raw_order_); a reader still using a released one keeps it.
|
||||
mutable std::vector<std::shared_ptr<const HDF5ImageSource::RawFile>> raw_files_;
|
||||
mutable std::vector<uint64_t> user_block_;
|
||||
mutable std::vector<size_t> raw_order_;
|
||||
static Layout ReadLayout(HDF5ReadOnlyFile &file, const Frame &frame);
|
||||
|
||||
// The files, in the order given, every frame in them, and the run's mean of every value the geometry
|
||||
|
||||
@@ -722,7 +722,7 @@ void Rugnux::DetectSaturation(int start_image, int images_to_process) {
|
||||
logger.Info("Saturation: the values of {} sampled frames pile up from {} - the file's limit is {}{}",
|
||||
sample.size(), *ceiling, stated,
|
||||
adopt ? ", so pixels from there on are treated as overloaded"
|
||||
: *ceiling < stated ? "; the file's is kept (written by Jungfraujoch)" : "");
|
||||
: *ceiling < stated ? "; the stated limit is kept (written by Jungfraujoch, or given with --saturation)" : "");
|
||||
if (adopt)
|
||||
experiment_.Detector().SaturationLimit(*ceiling);
|
||||
}
|
||||
Reference in new issue
Block a user