From 0633281aecda3ef8cedf1a83885b6d0a9b5e473b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20de=20la=20Pe=C3=B1a?= Date: Fri, 13 Oct 2023 16:17:29 +0200 Subject: [PATCH] Fix in est_shift2D method and tests --- hyperspy/_signals/signal2d.py | 4 ++-- hyperspy/tests/signals/test_2D_tools.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hyperspy/_signals/signal2d.py b/hyperspy/_signals/signal2d.py index 6f9244c091..1b76fa6c79 100644 --- a/hyperspy/_signals/signal2d.py +++ b/hyperspy/_signals/signal2d.py @@ -516,8 +516,8 @@ def estimate_shift2D(self, ('shift', np.int32, (2,))])) nshift, max_value = estimate_image_shift( - self(), - self(), + self._get_current_data(), + self._get_current_data(), roi=roi, sobel=sobel, medfilter=medfilter, diff --git a/hyperspy/tests/signals/test_2D_tools.py b/hyperspy/tests/signals/test_2D_tools.py index d0b6f94921..a1bdee4f7f 100644 --- a/hyperspy/tests/signals/test_2D_tools.py +++ b/hyperspy/tests/signals/test_2D_tools.py @@ -79,8 +79,9 @@ def test_align_subpix(self): def test_estimate_subpix(self, normalize_corr, reference): s = self.signal shifts = s.estimate_shift2D(sub_pixel_factor=200, - normalize_corr=normalize_corr) - np.testing.assert_allclose(shifts, self.shifts, rtol=0.2, atol=0.2, + normalize_corr=normalize_corr, + reference=reference) + np.testing.assert_allclose(shifts, self.shifts, rtol=2, atol=0.2, verbose=True) @pytest.mark.parametrize(("plot"), [True, 'reuse'])