Skip to content

Commit

Permalink
misc cleanup, reducing pr delta from draft work
Browse files Browse the repository at this point in the history
  • Loading branch information
garrettwrong committed Oct 22, 2024
1 parent 257bbb5 commit b86318b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion src/aspire/image/xform.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ def __init__(self, factor):
self.multipliers = np.array(factor)

def _forward(self, im, indices):

if self.multipliers.size == 1: # if we have a scalar multiplier
im_new = im * self.multipliers.astype(im.dtype)
else:
Expand Down
1 change: 1 addition & 0 deletions src/aspire/reconstruction/estimator.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ def apply_kernel(self, vol_coef, kernel=None):

if kernel is None:
kernel = self.kernel

vol = Coef(self.basis, vol_coef).evaluate() # returns a Volume
vol = kernel.convolve_volume(vol) # returns a Volume
vol_coef = self.basis.evaluate_t(vol)
Expand Down
4 changes: 2 additions & 2 deletions src/aspire/reconstruction/mean.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
from scipy.linalg import norm
from scipy.sparse.linalg import LinearOperator

from aspire import config
from aspire.basis import Coef
from aspire.nufft import anufft
from aspire.numeric import config, fft
from aspire.numeric import fft
from aspire.numeric.scipy import cg
from aspire.operators import evaluate_src_filters_on_grid
from aspire.reconstruction import Estimator, FourierKernel, FourierKernelMatrix
Expand Down Expand Up @@ -211,7 +212,6 @@ def conj_grad(self, b_coef, x0=None, tol=1e-5, regularizer=0):
precond_kernel = self.precond_kernel
if regularizer > 0:
precond_kernel += regularizer

M = LinearOperator(
(self.r * count, self.r * count),
matvec=partial(self.apply_kernel, kernel=precond_kernel),
Expand Down
1 change: 0 additions & 1 deletion tests/test_FBbasis3D.py
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,6 @@ def testFBBasis3DExpand(self, basis):
"L, dtype",
params,
)
@pytest.mark.skip(reason="Failing for L=64 due to NaN values.")
def testHighResFBbasis3D(L, dtype):
seed = 42
basis = FBBasis3D(L, dtype=dtype)
Expand Down

0 comments on commit b86318b

Please sign in to comment.