Skip to content

Commit ac9fbcd

Browse files
committed
Add Defaults to param descriptions
1 parent ed0b146 commit ac9fbcd

1 file changed

Lines changed: 27 additions & 14 deletions

File tree

src/aspire/abinitio/commonline_nug.py

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,41 @@ def __init__(
4343
**kwargs,
4444
):
4545
"""
46-
Initialize the symmetric NUG orientation estimator.
46+
Initialize the symmetric NUG orientation estimator. All default values match those used
47+
for publication results, with exception of `pr_iters`, which controls how many iterations
48+
of proximal refinement to be used. The default of None runs the algorithm without proximal
49+
refinement. Set to `pr_iters` to 4 to match the proximal refinement workflow in the related
50+
publication.
4751
4852
:param src: Source containing the input projection images.
4953
:param symmetry: Cyclic or dihedral symmetry specification, such as 'C3' or
5054
'D4'. If omitted, uses the source symmetry.
51-
:param n_rad: Number of radial samples in the polar Fourier transform.
52-
:param n_theta: Number of angular samples in the polar Fourier transform.
53-
:param max_shift: Maximum shift considered when comparing common lines.
54-
:param shift_step: Sampling interval for candidate shifts.
55-
:param mask: Whether to apply a circular mask to the input images.
55+
:param n_rad: Number of radial samples in the polar Fourier transform. If None,
56+
n_rad will default to the ceiling of half the resolution of the source.
57+
:param n_theta: Number of angular samples in the polar Fourier transform. This
58+
value must be even. Default is 360.
59+
:param max_shift: Determines maximum range for shifts for common-line detection
60+
as a proportion of the resolution. Default is 0.15.
61+
:param shift_step:Resolution of shift estimation common-line detection in pixels.
62+
Default is 1 pixel.
63+
:param mask: Option to mask `src.images` with a fuzzy mask (boolean).
64+
Default, `True`, applies a mask.
5665
:param Lmax: Maximum Wigner representation degree used in the relaxation.
66+
Default is 12.
5767
:param T: Quadrature resolution used to compute the Fourier coefficients.
58-
:param max_iter: Number of ADMM iterations.
59-
:param rho: Initial ADMM penalty parameter.
60-
:param ratio: Residual ratio used when updating the ADMM penalty.
61-
:param factor: Scaling factor used when updating the ADMM penalty.
62-
:param mult: Step-size multiplier for the ADMM primal update.
63-
:param S2_grid: Number of sphere samples used to discretize SO(3).
68+
Default is 36.
69+
:param max_iter: Number of ADMM iterations. Default is 501.
70+
:param rho: Initial ADMM penalty parameter. Default 0.05.
71+
:param ratio: Residual ratio used when updating the ADMM penalty. Default is 1.
72+
:param factor: Scaling factor used when updating the ADMM penalty. Default is 1.0.
73+
:param mult: Step-size multiplier for the ADMM primal update. Default is 1.5.
74+
:param S2_grid: Number of sphere samples used to discretize SO(3). Default is 441.
6475
:param Nstep_yI: Number of inequality-multiplier updates per ADMM iteration.
76+
Default is 10.
6577
:param pr_iters: Number of proximal refinement iterations. Default of None
66-
does not perform proximal refinement. Recommended value is 4.
67-
:param verbose: Whether to log ADMM progress.
78+
does not perform proximal refinement. Recommended value when using is 4.
79+
:param verbose: Whether to log ADMM and proximal refinement progress.
80+
Default is True.
6881
"""
6982

7083
super().__init__(

0 commit comments

Comments
 (0)