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

fixed python bindings - only read headers of modules that are in the roi
All checks were successful
Build on RHEL8 / build (push) Successful in 2m51s
Details
Build on RHEL9 / build (push) Successful in 2m53s
Details

Browse Source
This commit is contained in:
mazzol_a
2025-06-16 11:07:00 +02:00
parent 35114cde9d
commit 9f8eee5d08
5 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/RawFile.cpp
View File

@@ -62,7 +62,7 @@ void RawFile::read_into(std::byte *image_buf, size_t n_frames,
this->get_frame_into(m_current_frame++, image_buf, header);
image_buf += bytes_per_frame();
if (header)
header += m_geometry.n_modules();
header += m_geometry.n_modules_in_roi();
}
}
@@ -98,6 +98,9 @@ size_t RawFile::bitdepth() const { return m_master.bitdepth(); }
xy RawFile::geometry() { return m_master.geometry(); }
size_t RawFile::n_modules() const { return m_geometry.n_modules(); };
size_t RawFile::n_modules_in_roi() const {
return m_geometry.n_modules_in_roi();
};
void RawFile::open_subfiles() {
if (m_mode == "r")

17
src/RawFile.test.cpp
View File

@@ -257,12 +257,21 @@ TEST_CASE_PRIVATE(aare, open_multi_module_file_with_roi,
RawFile f(fpath, "r");
REQUIRE(f.master().roi().value().width() == 256);
REQUIRE(f.master().roi().value().height() == 256);
SECTION("read 2 frames") {
REQUIRE(f.master().roi().value().width() == 256);
REQUIRE(f.master().roi().value().height() == 256);
CHECK(f.m_geometry.n_modules() == 2);
CHECK(f.m_geometry.n_modules() == 2);
CHECK(f.m_geometry.n_modules_in_roi() == 1);
CHECK(f.m_geometry.n_modules_in_roi() == 1);
auto frames = f.read_n(2);
CHECK(frames.size() == 2);
CHECK(frames[0].rows() == 256);
CHECK(frames[1].cols() == 256);
}
}
} // close namespace aare