detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2026-02-20 01:28:41 +01:00
Code Issues Actions Packages Releases Activity

efficiently read in one hyperslab read instead of multiple reads in a loop
All checks were successful
Build on RHEL9 / build (push) Successful in 2m24s
Details
Build on RHEL8 / build (push) Successful in 2m26s
Details

Browse Source
This commit is contained in:
maliakal_d
2025-06-05 00:38:27 +02:00
parent 76b8872fe6
commit a3f831dc9e
2 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/Hdf5File.cpp
View File

@@ -27,30 +27,21 @@ Frame Hdf5File::read_frame(size_t frame_number) {
}
void Hdf5File::read_into(std::byte *image_buf, size_t n_frames) {
// TODO: implement this in a more efficient way
for (size_t i = 0; i < n_frames; i++) {
get_frame_into(m_current_frame++, image_buf);
image_buf += bytes_per_frame();
}
get_frame_into(m_current_frame++, image_buf, n_frames);
}
void Hdf5File::read_into(std::byte *image_buf) {
return get_frame_into(m_current_frame++, image_buf);
get_frame_into(m_current_frame++, image_buf);
}
void Hdf5File::read_into(std::byte *image_buf, DetectorHeader *header) {
return get_frame_into(m_current_frame++, image_buf, header);
get_frame_into(m_current_frame, image_buf, 1, header);
}
void Hdf5File::read_into(std::byte *image_buf, size_t n_frames,
DetectorHeader *header) {
for (size_t i = 0; i < n_frames; i++) {
get_frame_into(m_current_frame++, image_buf, header);
image_buf += bytes_per_frame();
header += n_modules();
}
get_frame_into(m_current_frame++, image_buf, n_frames, header);
}
size_t Hdf5File::bytes_per_frame() {
@@ -119,30 +110,25 @@ DetectorHeader Hdf5File::read_header(const std::filesystem::path &fname) {
}
Frame Hdf5File::get_frame(size_t frame_index) {
auto f = Frame(m_rows, m_cols, Dtype::from_bitdepth(m_master.bitdepth()));
std::byte *frame_buffer = f.data();
get_frame_into(frame_index, frame_buffer);
return f;
}
void Hdf5File::get_frame_into(size_t frame_index, std::byte *frame_buffer,
DetectorHeader *header) {
if (frame_index >= m_master.frames_in_file()) {
void Hdf5File::get_frame_into(size_t frame_index, std::byte *frame_buffer, size_t n_frames, DetectorHeader *header) {
if ((frame_index + n_frames - 1) >= m_master.frames_in_file()) {
throw std::runtime_error(LOCATION + "Frame number out of range");
}
get_data_into(frame_index, frame_buffer);
m_current_frame += n_frames;
if (header) {
for (size_t part_idx = 0; part_idx != m_master.n_modules(); ++part_idx) {
get_header_into(frame_index, part_idx, header);
header++;
for (size_t i = 0; i < n_frames; i++) {
for (size_t part_idx = 0; part_idx != m_master.n_modules(); ++part_idx) {
get_header_into(frame_index + i, part_idx, header);
header++;
}
}
}
}
void Hdf5File::get_data_into(size_t frame_index, std::byte *frame_buffer) {
m_data_file->get_data_into(frame_index, frame_buffer);
void Hdf5File::get_data_into(size_t frame_index, std::byte *frame_buffer, size_t n_frames) {
m_data_file->get_data_into(frame_index, frame_buffer, n_frames);
}
void Hdf5File::get_header_into(size_t frame_index, int part_index, DetectorHeader *header) {
@@ -170,6 +156,13 @@ void Hdf5File::get_header_into(size_t frame_index, int part_index, DetectorHeade
}
}
Frame Hdf5File::get_frame(size_t frame_index) {
auto f = Frame(m_rows, m_cols, Dtype::from_bitdepth(m_master.bitdepth()));
std::byte *frame_buffer = f.data();
get_frame_into(frame_index, frame_buffer);
return f;
}
std::vector<Frame> Hdf5File::read_n(size_t n_frames) {
// TODO: implement this in a more efficient way
std::vector<Frame> frames;