refactor phase and fluorescence to use "filter bank" functions

mehta-lab · Feb 11, 2025 · 59df17c · 59df17c
1 parent 4334ec2
commit 59df17c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/waveorder/models/isotropic_fluorescent_thick_3d.py b/waveorder/models/isotropic_fluorescent_thick_3d.py
@@ -217,7 +217,10 @@ def apply_inverse_transfer_function(
         inverse_filter = tikhonov_regularized_inverse_filter(
             optical_transfer_function, regularization_strength
         )
-        f_real = apply_filter_bank(inverse_filter, zyx_padded)
+
+        # [None]s and [0] are for applying a 1x1 "bank" of filters.
+        # For further uniformity, consider returning (1, Z, Y, X)
+        f_real = apply_filter_bank(inverse_filter[None, None], zyx_padded[None])[0]
     elif reconstruction_algorithm == "TV":
         raise NotImplementedError
         f_real = util.single_variable_admm_tv_deconvolution_3D(

diff --git a/waveorder/models/phase_thick_3d.py b/waveorder/models/phase_thick_3d.py
@@ -257,7 +257,10 @@ def apply_inverse_transfer_function(
         inverse_filter = tikhonov_regularized_inverse_filter(
             effective_transfer_function, regularization_strength
         )
-        f_real = apply_filter_bank(inverse_filter, zyx)
+
+        # [None]s and [0] are for applying a 1x1 "bank" of filters.
+        # For further uniformity, consider returning (1, Z, Y, X)
+        f_real = apply_filter_bank(inverse_filter[None, None], zyx[None])[0]
 
     elif reconstruction_algorithm == "TV":
         raise NotImplementedError