From 19082fbc23046c3486586f55d4f6e8d20f7c847b Mon Sep 17 00:00:00 2001 From: Alice Date: Thu, 19 Feb 2026 14:49:41 +0100 Subject: [PATCH] solved merge conflict --- python/src/module.cpp | 2 -- python/tests/test_RawFile.py | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/src/module.cpp b/python/src/module.cpp index 5c66964..19bbe29 100644 --- a/python/src/module.cpp +++ b/python/src/module.cpp @@ -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" diff --git a/python/tests/test_RawFile.py b/python/tests/test_RawFile.py index 2d3909b..443c093 100644 --- a/python/tests/test_RawFile.py +++ b/python/tests/test_RawFile.py @@ -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):