From dcb917164ecd54dafc7c3055bb7aa18d46fd9db1 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Thu, 6 Apr 2017 09:51:09 -0400 Subject: [PATCH] Revert "Wrap large and negative shifts" This reverts commit c1b25b9281943e53e17f8ee2b9d1a13115ecd0eb. The commit is being reverted as we do not need to ensure all shifts are positive in this way. They already are as the shift was determined by an array index corresponding to the largest value. So this will always be positive semi-definite. --- nanshe/imp/registration.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nanshe/imp/registration.py b/nanshe/imp/registration.py index 0d14b55c..4e9bbd56 100644 --- a/nanshe/imp/registration.py +++ b/nanshe/imp/registration.py @@ -272,10 +272,6 @@ def register_mean_offsets(frames2reg, frames2reg_fft[range_ij], template_fft ) - # Translate shifts to fit within one frame. - for range_ij in iters.subrange(0, len(frames2reg), block_frame_length): - this_space_shift[range_ij] %= numpy.array(frames2reg_fft.shape[1:]) - # Remove global shifts. this_space_shift_mean[...] = 0 for range_ij in iters.subrange(0, len(frames2reg), block_frame_length):