solved merge conflict
Some checks failed
Build on RHEL8 / build (push) Successful in 2m22s
Build on RHEL9 / build (push) Successful in 2m42s
Run tests using data on local RHEL8 / build (push) Failing after 3m2s

This commit is contained in:
2026-02-19 14:49:41 +01:00
parent 2fb9924875
commit 19082fbc23
2 changed files with 4 additions and 4 deletions

View File

@@ -22,8 +22,6 @@
#include "fit.hpp"
#include "jungfrau_data_file.hpp"
#include "pedestal.hpp"
#include "pixel_map.hpp"
#include "raw_file.hpp"
#include "raw_master_file.hpp"
#include "raw_sub_file.hpp"
#include "var_cluster.hpp"

View File

@@ -14,6 +14,9 @@ def test_read_rawfile_with_roi_spanning_over_one_module(test_data_path):
assert headers.size == 10100
assert frames.shape == (10100, 256, 256)
assert headers.size == 10100
assert frames.shape == (10100, 256, 256)
@pytest.mark.withdata
def test_read_rawfile_with_multiple_rois(test_data_path):
with RawFile(test_data_path / "raw/ROITestData/MultipleROIs/run_master_0.json") as f:
@@ -44,8 +47,7 @@ def test_read_rawfile_with_multiple_rois(test_data_path):
assert frame[0].shape == (301, 101)
assert f.tell() == 2
assert headers.size == 10100
assert frames.shape == (10100, 256, 256)
@pytest.mark.withdata
def test_read_rawfile_quad_eiger_and_compare_to_numpy(test_data_path):