Refactor using property

Author: j-c-c

src/aspire/abinitio/commonline_base.py

@@ -57,6 +57,7 @@ def __init__(
         self.shift_step = shift_step
         self.mask = mask
         self.rotations = None
+        self._pf = None
 
         self._build()
 
@@ -77,6 +78,12 @@ def _build(self):
             logger.error(msg)
             raise NotImplementedError(msg)
 
+    @property
+    def pf(self):
+        if self._pf is None:
+            self._pf = self._prepare_pf()
+        return self._pf
+
     def _prepare_pf(self):
         """
         Prepare the polar Fourier transform used for correlations.
@@ -88,15 +95,17 @@ def _prepare_pf(self):
             imgs = imgs * fuzz_mask
 
         # Obtain coefficients of polar Fourier transform for input 2D images
-        self.pft = PolarFT(
+        pft = PolarFT(
             (self.n_res, self.n_res), self.n_rad, self.n_theta, dtype=self.dtype
         )
-        self.pf = self.pft.transform(imgs)
+        pf = pft.transform(imgs)
 
         # We remove the DC the component. pf has size (n_img) x (n_theta/2) x (n_rad-1),
         # with pf[:, :, 0] containing low frequency content and pf[:, :, -1] containing
         # high frequency content.
-        self.pf = self.pf[:, :, 1:]
+        pf = pf[:, :, 1:]
+
+        return pf
 
     def estimate_rotations(self):
         """
@@ -110,8 +119,6 @@ def build_clmatrix(self):
         """
         Build common-lines matrix from Fourier stack of 2D images
         """
-        self._prepare_pf()
-
         n_img = self.n_img
         n_check = self.n_check
 

src/aspire/abinitio/commonline_c2.py

@@ -94,8 +94,6 @@ def build_clmatrix(self):
         Build common-lines matrix for molecules with C2 symmetry from Fourier stack of 2D images.
         This consists of finding for each pair of images the two common-lines induced by the 2-fold symmetry.
         """
-        self._prepare_pf()
-
         n_img = self.n_img
 
         if self.n_theta % 2 == 1:

src/aspire/abinitio/commonline_cn.py

@@ -104,7 +104,6 @@ def estimate_rotations(self):
 
     def _estimate_relative_viewing_directions(self):
         logger.info(f"Estimating relative viewing directions for {self.n_img} images.")
-        self._prepare_pf()
         pf = self.pf
 
         # Generate candidate rotation matrices and the common-line and

tests/test_orient_symmetric.py

@@ -173,7 +173,6 @@ def test_self_relative_rotations(n_img, L, order, dtype):
     src, cl_symm = source_orientation_objs(n_img, L, order, dtype)
 
     # Estimate self-relative viewing directions, Riis.
-    cl_symm._prepare_pf()  # Required to compute self_clmatrix.
     scl = cl_symm._self_clmatrix_c3_c4()
     Riis = cl_symm._estimate_all_Riis_c3_c4(scl)
 
@@ -302,7 +301,6 @@ def test_self_commonlines(n_img, L, order, dtype):
     n_theta = cl_symm.n_theta
 
     # Initialize common-lines orientation estimation object and compute self-common-lines matrix.
-    cl_symm._prepare_pf()  # Requires polar Fourier transform.
     scl = cl_symm._self_clmatrix_c3_c4()
 
     # Compute ground truth self-common-lines matrix.