Skip to content

Commit b000a87

Browse files
Add aspire.utils.coor_trans.crop_2d and move coor_trans objects to second-level API access (#565)
* utils.coor_trans methods accessible from second level * crop_2d method * crop2d test * clarify flooring behavior for centering and add apdding * tests finished * isort shenanigans * fix even to odd n->n+1 padding bug * slightly better comment * better behavior for dtype * remove mistaken characters * fixes after merge * last ensure removed * rect tests * padding tests and fill value test * better comments * even better comments * np.diag * crop_pad_2d * clarifying comment when padding
1 parent efd9744 commit b000a87

File tree

19 files changed

+259
-32
lines changed

19 files changed

+259
-32
lines changed

gallery/tutorials/lecture_feature_demo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
from aspire.noise import AnisotropicNoiseEstimator, WhiteNoiseEstimator
4343
from aspire.operators import FunctionFilter, RadialCTFFilter, ScalarFilter
4444
from aspire.source import RelionSource, Simulation
45-
from aspire.utils import Rotation
46-
from aspire.utils.coor_trans import (
45+
from aspire.utils import (
46+
Rotation,
4747
get_aligned_rotations,
4848
get_rots_mse,
4949
register_rotations,

gallery/tutorials/orient3d_simulation.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
from aspire.abinitio import CLSyncVoting
1616
from aspire.operators import RadialCTFFilter
1717
from aspire.source.simulation import Simulation
18-
from aspire.utils.coor_trans import (
19-
get_aligned_rotations,
20-
get_rots_mse,
21-
register_rotations,
22-
)
18+
from aspire.utils import get_aligned_rotations, get_rots_mse, register_rotations
2319
from aspire.volume import Volume
2420

2521
logger = logging.getLogger(__name__)

src/aspire/abinitio/commonline_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from aspire.abinitio.orientation_src import OrientEstSource
88
from aspire.basis import PolarBasis2D
9-
from aspire.utils.coor_trans import common_line_from_rots
9+
from aspire.utils import common_line_from_rots
1010
from aspire.utils.random import choice
1111

1212
logger = logging.getLogger(__name__)

src/aspire/basis/basis_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from numpy.polynomial.legendre import leggauss
1111
from scipy.special import jn, jv, sph_harm
1212

13-
from aspire.utils.coor_trans import grid_2d, grid_3d
13+
from aspire.utils import grid_2d, grid_3d
1414

1515
logger = logging.getLogger(__name__)
1616

src/aspire/ctf/ctf_estimator.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
from aspire.numeric import fft
2222
from aspire.operators import voltage_to_wavelength
2323
from aspire.storage import StarFile
24-
from aspire.utils import abs2, complex_type
25-
from aspire.utils.coor_trans import grid_1d, grid_2d
24+
from aspire.utils import abs2, complex_type, grid_1d, grid_2d
2625

2726
logger = logging.getLogger(__name__)
2827

src/aspire/denoising/adaptive_support.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from aspire.noise import WhiteNoiseEstimator
66
from aspire.numeric import fft
77
from aspire.source import ImageSource
8-
from aspire.utils.coor_trans import grid_2d
8+
from aspire.utils import grid_2d
99

1010
logger = logging.getLogger(__name__)
1111

src/aspire/image/image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import aspire.volume
1010
from aspire.nufft import anufft
1111
from aspire.numeric import fft, xp
12-
from aspire.utils.coor_trans import grid_2d
12+
from aspire.utils import grid_2d
1313
from aspire.utils.matrix import anorm
1414

1515
logger = logging.getLogger(__name__)

src/aspire/noise/noise.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from aspire.numeric import fft, xp
66
from aspire.operators import ArrayFilter, ScalarFilter
7-
from aspire.utils.coor_trans import grid_2d
7+
from aspire.utils import grid_2d
88

99
logger = logging.getLogger(__name__)
1010

src/aspire/operators/filters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import numpy as np
66
from scipy.interpolate import RegularGridInterpolator
77

8-
from aspire.utils.coor_trans import grid_2d
8+
from aspire.utils import grid_2d
99
from aspire.utils.filter_to_fb_mat import filter_to_fb_mat
1010

1111
logger = logging.getLogger(__name__)

src/aspire/source/image.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
PowerFilter,
2323
)
2424
from aspire.storage import MrcStats, StarFile
25-
from aspire.utils import Rotation
26-
from aspire.utils.coor_trans import grid_2d
25+
from aspire.utils import Rotation, grid_2d
2726

2827
logger = logging.getLogger(__name__)
2928

0 commit comments

Comments
 (0)