Skip to content

Commit 0309a13

Browse files
committed
misc cleanup, reducing pr delta from draft work
1 parent 0d1f0de commit 0309a13

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/aspire/image/xform.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ def __init__(self, factor):
144144
self.multipliers = np.array(factor)
145145

146146
def _forward(self, im, indices):
147-
148147
if self.multipliers.size == 1: # if we have a scalar multiplier
149148
im_new = im * self.multipliers.astype(im.dtype)
150149
else:

src/aspire/reconstruction/estimator.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ def apply_kernel(self, vol_coef, kernel=None):
159159

160160
if kernel is None:
161161
kernel = self.kernel
162+
162163
vol = Coef(self.basis, vol_coef).evaluate() # returns a Volume
163164
vol = kernel.convolve_volume(vol) # returns a Volume
164165
vol_coef = self.basis.evaluate_t(vol)

src/aspire/reconstruction/mean.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
from scipy.linalg import norm
66
from scipy.sparse.linalg import LinearOperator
77

8+
from aspire import config
89
from aspire.basis import Coef
910
from aspire.nufft import anufft
10-
from aspire.numeric import config, fft
11+
from aspire.numeric import fft
1112
from aspire.numeric.scipy import cg
1213
from aspire.operators import evaluate_src_filters_on_grid
1314
from aspire.reconstruction import Estimator, FourierKernel, FourierKernelMatrix
@@ -211,7 +212,6 @@ def conj_grad(self, b_coef, x0=None, tol=1e-5, regularizer=0):
211212
precond_kernel = self.precond_kernel
212213
if regularizer > 0:
213214
precond_kernel += regularizer
214-
215215
M = LinearOperator(
216216
(self.r * count, self.r * count),
217217
matvec=partial(self.apply_kernel, kernel=precond_kernel),

0 commit comments

Comments
 (0)