import private util functions directly

Author: j-c-c

src/aspire/abinitio/__init__.py

@@ -1,11 +1,6 @@
 # isort: off
 from .commonline_utils import (
     JSync,
-    _cl_angles_to_ind,
-    _estimate_third_rows,
-    _complete_third_row_to_rot,
-    _estimate_inplane_rotations,
-    _generate_shift_phase_and_filter,
     build_outer_products,
     g_sync,
 )

src/aspire/abinitio/commonline_base.py

@@ -5,12 +5,13 @@
 import numpy as np
 import scipy.sparse as sparse
 
-from aspire.abinitio import _generate_shift_phase_and_filter
 from aspire.image import Image
 from aspire.operators import PolarFT
 from aspire.utils import Rotation, complex_type, fuzzy_mask, tqdm
 from aspire.utils.random import choice
 
+from .commonline_utils import _generate_shift_phase_and_filter
+
 logger = logging.getLogger(__name__)
 
 

src/aspire/abinitio/commonline_c2.py

@@ -3,15 +3,14 @@
 import numpy as np
 from scipy.linalg import eigh
 
-from aspire.abinitio import (
-    CLOrient3D,
-    JSync,
-    SyncVotingMixin,
+from aspire.abinitio import CLOrient3D, JSync, SyncVotingMixin
+from aspire.utils import J_conjugate, Rotation, all_pairs
+
+from .commonline_utils import (
     _complete_third_row_to_rot,
     _estimate_third_rows,
     _generate_shift_phase_and_filter,
 )
-from aspire.utils import J_conjugate, Rotation, all_pairs
 
 logger = logging.getLogger(__name__)
 

src/aspire/abinitio/commonline_c3_c4.py

@@ -3,16 +3,15 @@
 import numpy as np
 from numpy.linalg import norm, svd
 
-from aspire.abinitio import (
-    CLOrient3D,
-    JSync,
-    SyncVotingMixin,
+from aspire.abinitio import CLOrient3D, JSync, SyncVotingMixin
+from aspire.operators import PolarFT
+from aspire.utils import J_conjugate, Rotation, all_pairs, anorm, trange
+
+from .commonline_utils import (
     _estimate_inplane_rotations,
     _estimate_third_rows,
     _generate_shift_phase_and_filter,
 )
-from aspire.operators import PolarFT
-from aspire.utils import J_conjugate, Rotation, all_pairs, anorm, trange
 
 logger = logging.getLogger(__name__)
 

src/aspire/abinitio/commonline_cn.py

@@ -3,15 +3,7 @@
 import numpy as np
 from numpy.linalg import norm
 
-from aspire.abinitio import (
-    CLOrient3D,
-    JSync,
-    _cl_angles_to_ind,
-    _complete_third_row_to_rot,
-    _estimate_inplane_rotations,
-    _estimate_third_rows,
-    _generate_shift_phase_and_filter,
-)
+from aspire.abinitio import CLOrient3D, JSync
 from aspire.operators import PolarFT
 from aspire.utils import (
     J_conjugate,
@@ -25,6 +17,14 @@
 )
 from aspire.utils.random import Random, randn
 
+from .commonline_utils import (
+    _cl_angles_to_ind,
+    _complete_third_row_to_rot,
+    _estimate_inplane_rotations,
+    _estimate_third_rows,
+    _generate_shift_phase_and_filter,
+)
+
 logger = logging.getLogger(__name__)
 
 

src/aspire/abinitio/commonline_d2.py

@@ -4,12 +4,14 @@
 import scipy.sparse.linalg as la
 from numpy.linalg import norm
 
-from aspire.abinitio import CLOrient3D, _generate_shift_phase_and_filter
+from aspire.abinitio import CLOrient3D
 from aspire.operators import PolarFT
 from aspire.utils import J_conjugate, Rotation, all_pairs, all_triplets, tqdm, trange
 from aspire.utils.random import randn
 from aspire.volume import DnSymmetryGroup
 
+from .commonline_utils import _generate_shift_phase_and_filter
+
 logger = logging.getLogger(__name__)
 
 

tests/test_orient_symmetric.py

@@ -5,11 +5,11 @@
     CLSymmetryC2,
     CLSymmetryC3C4,
     CLSymmetryCn,
-    _cl_angles_to_ind,
     build_outer_products,
     g_sync,
 )
 from aspire.abinitio.commonline_cn import MeanOuterProductEstimator
+from aspire.abinitio.commonline_utils import _cl_angles_to_ind
 from aspire.source import Simulation
 from aspire.utils import (
     J_conjugate,