revert last approach in favor of using evaluate per dev meeting

Author: garrettwrong

src/aspire/covariance/covar2d.py

@@ -562,12 +562,15 @@ def filters_to_basis_mats(self):
         optimized_expand = callable(
             getattr(self.basis.__class__, "expand_radial_vec", None)
         )
-        if optimized_expand and isinstance(self.src.filter_stack, CTFFilter):
+        if optimized_expand and self.src.filter_stack.radial:
             logger.info(
-                "Found all filters are CTF, and `basis.expand_radial_vec` available using, bulk basis mat eval"
+                "Found radial filter stack and `basis.expand_radial_vec` available."
+                "  Using bulk basis mat eval."
             )
-            return self._ctf_filters_to_basis_mats()
+            return self._filter_stack_to_basis_mats()
         else:
+            # Note, can come back and optmize the filter eval to bulk, just not radial
+            # For now use legacy path.
             logger.info("Using sequential basis mat eval")
             return self._filters_to_basis_mats()
 
@@ -585,20 +588,18 @@ def _filters_to_basis_mats(self):
         ]
         return basis_mats
 
-    def _ctf_filters_to_basis_mats(self):
-        # lol
-        logger.info("Extracting CTF filter parameters and generating eval points")
-        params = self.src.filter_stack._ctf_params()
-
-        logger.info("Computing CTF filters at eval points")
+    # todo, either rename _radial_filters_to_basis_mats or handle none radial
+    # same remark as `filters_to_basis_mats`
+    def _filter_stack_to_basis_mats(self):
+        logger.info("Generating filter eval points")
         _filter_pts = self.basis._filter_pts
         # if we have many filters, might be worth trip to GPU
         if len(self.src.filter_stack) >= 2048:
             params = xp.asarray(params)
             _filter_pts = xp.asarray(_filter_pts)
 
-        _filter_vals = CTFFilter.ctf_formula(
-            _filter_pts, self.src.pixel_size, *(params.T)
+        _filter_vals = self.src.filter_stack.evaluate(
+            _filter_pts, pixel_size=self.src.pixel_size
         )
 
         logger.info("Computing basis radial expansion")

src/aspire/operators/filters.py

@@ -89,7 +89,16 @@ def evaluate(self, omega, **kwargs):
         h = self._evaluate(omega, **kwargs)
 
         if self.radial:
-            h = np.take(h, idx)
+            # The reshape and take axis gynmastics work to provide the
+            # legacy idx taking functionality for both singleton and
+            # stack cases.
+            #   reshape (stack, vals)
+            h = h.reshape(len(self), -1)
+            #   keep stack, take along vals axis
+            h = np.take(h, idx, axis=-1)
+            #   squeeze off stack dim from singleton case (preserves legacy behavior)
+            if h.shape[0] == 1:  # avoid error when len(h)>1
+                h = np.squeeze(h, axis=0)
 
         return h
 
@@ -158,7 +167,12 @@ def __len__(self):
         return 1
 
     def _ctf_params(self):
-        raise NotImplementedError(f"Not implemented for {self.__class__.__name__}")
+        """
+        Return n_filters-by-n_param array from prior filter.
+        """
+        raise NotImplementedError(
+            f"_ctf_params not implemented for {self.__class__.__name__}"
+        )
 
 
 class DualFilter(Filter):
@@ -329,7 +343,7 @@ def _init_size(self):
     def _evaluate(self, omega, **kwargs):
         res = 1
         for c in self._components:
-            res *= c.evaluate(omega, **kwargs)
+            res = res * c.evaluate(omega, **kwargs)
         return res
 
     def __len__(self):
@@ -341,8 +355,13 @@ def _ctf_params(self):
 
         Raises error if multiple or none found.
         """
-        _params = [getattr(c, "_ctf_params", None) for c in self._components]
-        _params = list(filter(_params, None))
+        _params = []
+        for c in self._components:
+            try:
+                _params.append(c._ctf_params())
+            except NotImplementedError as e:
+                pass
+
         if len(_params) > 1:
             raise RuntimeError("Multiple filters with CTF parameters found.")
         elif len(_params) == 0: