Skip to content

Commit 6f4d2bf

Browse files
committed
Set default n_theta value for all commonline algos. Use default value in testing.
1 parent f8f26ee commit 6f4d2bf

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/aspire/abinitio/commonline_c2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def __init__(
3535
self,
3636
src,
3737
n_rad=None,
38-
n_theta=None,
38+
n_theta=360,
3939
max_shift=0.15,
4040
shift_step=1,
4141
epsilon=1e-3,
@@ -50,7 +50,7 @@ def __init__(
5050
5151
:param src: The source object of 2D denoised or class-averaged images with metadata
5252
:param n_rad: The number of points in the radial direction
53-
:param n_theta: The number of points in the theta direction
53+
:param n_theta: The number of points in the theta direction. Default = 360.
5454
:param max_shift: Maximum range for shifts as a proportion of resolution. Default = 0.15.
5555
:param shift_step: Resolution of shift estimation in pixels. Default = 1 pixel.
5656
:param epsilon: Tolerance for the power method.

src/aspire/abinitio/commonline_c3_c4.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def __init__(
4444
src,
4545
symmetry=None,
4646
n_rad=None,
47-
n_theta=None,
47+
n_theta=360,
4848
max_shift=0.15,
4949
shift_step=1,
5050
epsilon=1e-2,
@@ -59,7 +59,7 @@ def __init__(
5959
:param src: The source object of 2D denoised or class-averaged images with metadata
6060
:param symmetry: A string, 'C3' or 'C4', indicating the symmetry type.
6161
:param n_rad: The number of points in the radial direction
62-
:param n_theta: The number of points in the theta direction
62+
:param n_theta: The number of points in the theta direction. Default = 360.
6363
:param max_shift: Maximum range for shifts as a proportion of resolution. Default = 0.15.
6464
:param shift_step: Resolution of shift estimation in pixels. Default = 1 pixel.
6565
:param epsilon: Tolerance for the power method.

src/aspire/abinitio/commonline_cn.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def __init__(
3131
src,
3232
symmetry=None,
3333
n_rad=None,
34-
n_theta=None,
34+
n_theta=360,
3535
max_shift=0.15,
3636
shift_step=1,
3737
epsilon=1e-3,
@@ -48,7 +48,7 @@ def __init__(
4848
:param src: The source object of 2D denoised or class-averaged images with metadata
4949
:param symmetry: A string, 'Cn', indicating the symmetry type.
5050
:param n_rad: The number of points in the radial direction.
51-
:param n_theta: The number of points in the theta direction.
51+
:param n_theta: The number of points in the theta direction. Default = 360.
5252
:param max_shift: Maximum range for shifts as a proportion of resolution. Default = 0.15.
5353
:param shift_step: Resolution of shift estimation in pixels. Default = 1 pixel.
5454
:param epsilon: Tolerance for the power method.

src/aspire/abinitio/commonline_d2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def __init__(
2828
self,
2929
src,
3030
n_rad=None,
31-
n_theta=None,
31+
n_theta=360,
3232
max_shift=0.15,
3333
shift_step=1,
3434
grid_res=1200,
@@ -43,7 +43,7 @@ def __init__(
4343
4444
:param src: The source object of 2D denoised or class-averaged images with metadata
4545
:param n_rad: The number of points in the radial direction of Fourier image.
46-
:param n_theta: The number of points in the theta direction of Fourier image.
46+
:param n_theta: The number of points in the theta direction of Fourier image. Default = 360.
4747
:param max_shift: Maximum range for shifts as a proportion of resolution. Default = 0.15.
4848
:param shift_step: Resolution of shift estimation in pixels. Default = 1 pixel.
4949
:param grid_res: Number of sampling points on sphere for projetion directions.

tests/test_orient_symmetric.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ def source_orientation_objs(n_img, L, order, dtype):
8484
seed=seed,
8585
)
8686

87+
# Use default n_theta = 360.
8788
cl_kwargs = dict(
8889
src=src,
89-
n_theta=360,
9090
max_shift=1 / L,
9191
seed=seed,
9292
mask=False,

0 commit comments

Comments
 (0)