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

Merge branch 'main' into fix/adapt_and_test_interpolation

Browse Source
This commit is contained in:
mazzol_a
2025-10-17 10:03:26 +02:00
committed by GitHub
parent 516ef88d10 e418986fd2
commit 6f10afbcdc
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
etc/dev-env.yml
View File

@@ -13,4 +13,5 @@ dependencies:
- pybind11 - pybind11
- numpy - numpy
- matplotlib - matplotlib
- nlohmann_json

7
src/RawMasterFile.cpp
View File

@@ -314,11 +314,8 @@ void RawMasterFile::parse_json(const std::filesystem::path &fpath) {
// if any of the values are set update the roi // if any of the values are set update the roi
if (tmp_roi.xmin != 4294967295 || tmp_roi.xmax != 4294967295 || if (tmp_roi.xmin != 4294967295 || tmp_roi.xmax != 4294967295 ||
tmp_roi.ymin != 4294967295 || tmp_roi.ymax != 4294967295) { tmp_roi.ymin != 4294967295 || tmp_roi.ymax != 4294967295) {
tmp_roi.xmax++;
if (v < 7.21) { tmp_roi.ymax++;
tmp_roi.xmax++; // why is it updated
tmp_roi.ymax++;
}
m_roi = tmp_roi; m_roi = tmp_roi;
} }