From 54926d99825a4b447a080a44c2940af5d0e98a1c Mon Sep 17 00:00:00 2001 From: VChristiaens Date: Wed, 7 Feb 2024 11:47:22 +0100 Subject: [PATCH] Adapted output parsing of the skimage.registration.phase_correlation function to match the new expected format --- vip_hci/preproc/recentering.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/vip_hci/preproc/recentering.py b/vip_hci/preproc/recentering.py index 8c235850..7af5286a 100644 --- a/vip_hci/preproc/recentering.py +++ b/vip_hci/preproc/recentering.py @@ -838,12 +838,12 @@ def _center_radon(array, cropsize=None, hsize=1., step=0.1, costf = [] for coord in coords: res = _radon_costf(frame, cent, radint, coord, satspots_cfg, - theta_0, delta_theta, imlib, interpolation) + theta_0, d_theta, imlib, interpolation) costf.append(res) costf = np.array(costf) elif nproc > 1: res = pool_map(nproc, _radon_costf, frame, cent, radint, - iterable(coords), satspots_cfg, theta_0, delta_theta, + iterable(coords), satspots_cfg, theta_0, d_theta, imlib, interpolation) costf = np.array(res) @@ -1321,12 +1321,11 @@ def _shift_dft(array_rec, array, frnum, upsample_factor, mask, interpolation, if version.parse(skimage.__version__) > version.parse('0.17.0'): shift_yx = cc_center(array_rec[0], array[frnum], upsample_factor=upsample_factor, - reference_mask=mask, return_error=False) - y_i, x_i = shift_yx + reference_mask=mask) else: shift_yx = cc_center(array_rec[0], array[frnum], upsample_factor=upsample_factor) - y_i, x_i = shift_yx[0] + y_i, x_i = shift_yx[0] array_rec_i = frame_shift(array[frnum], shift_y=y_i, shift_x=x_i, imlib=imlib, interpolation=interpolation, border_mode=border_mode)