Merge branch 'developer' of github.com:slsdetectorgroup/aare into developer

This commit is contained in:
Erik Fröjdh
2024-11-14 07:42:00 +01:00
6 changed files with 21 additions and 3 deletions

View File

@ -49,6 +49,7 @@ void RawFile::read_into(std::byte *image_buf) {
void RawFile::read_into(std::byte *image_buf, DetectorHeader *header) {
return get_frame_into(m_current_frame++, image_buf, header);
};
@ -61,6 +62,7 @@ void RawFile::read_into(std::byte *image_buf, size_t n_frames, DetectorHeader *h
if(header)
header+=n_mod();
}
};
size_t RawFile::n_mod() const { return n_subfile_parts; }
@ -132,7 +134,6 @@ DetectorHeader RawFile::read_header(const std::filesystem::path &fname) {
return h;
}
int RawFile::find_number_of_subfiles() {
int n_files = 0;
// f0,f1...fn How many files is the data split into?
@ -223,6 +224,7 @@ void RawFile::update_geometry_with_roi() {
} else {
if ((roi.ymin > m.y) && (roi.ymin < m.y + m.height)) {
m.height -= roi.ymin - m.y;
}
if (roi.ymax < m.y + m.height) {
m.height -= m.y + original_height - roi.ymax;