mirror of
https://github.com/slsdetectorgroup/aare.git
synced 2025-06-13 15:57:14 +02:00
Merge branch 'developer' of github.com:slsdetectorgroup/aare into developer
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user