Merge branch 'dev' into 14-implement-power-spectrum-normalization

src/cryo_challenge/_map_to_map/map_to_map_distance.py

@@ -34,6 +34,8 @@ def get_computed_assets(self, maps1, maps2, global_store_of_running_results):
 
 
 class L2DistanceNorm(MapToMapDistance):
+    """L2 distance norm"""
+
     def __init__(self, config):
         super().__init__(config)
 
@@ -43,6 +45,10 @@ def get_distance(self, map1, map2):
 
 
 class L2DistanceSum(MapToMapDistance):
+    """L2 distance.
+
+    Computed by summing the squared differences between the two maps."""
+
     def __init__(self, config):
         super().__init__(config)
 
@@ -55,6 +61,10 @@ def get_distance(self, map1, map2):
 
 
 class Correlation(MapToMapDistance):
+    """Correlation distance.
+
+    Not technically a distance metric, but a similarity."""
+
     def __init__(self, config):
         super().__init__(config)
 
@@ -67,6 +77,8 @@ def get_distance(self, map1, map2):
 
 
 class BioEM3dDistance(MapToMapDistance):
+    """BioEM 3D distance."""
+
     def __init__(self, config):
         super().__init__(config)
 
@@ -124,6 +136,10 @@ def get_distance(self, map1, map2):
 
 
 class FSCDistance(MapToMapDistance):
+    """Fourier Shell Correlation distance.
+
+    One minus the correlation between two maps in Fourier space."""
+
     def __init__(self, config):
         super().__init__(config)
 
@@ -215,9 +231,10 @@ def compute_cost_fsc_chunk(self, maps_gt_flat, maps_user_flat, n_pix):
         return cost_matrix, fsc_matrix
 
     @override
-    def get_distance_matrix(
-        self, maps1, maps2, global_store_of_running_results
-    ):  # custom method
+    def get_distance_matrix(self, maps1, maps2, global_store_of_running_results):
+        """
+        Applies a mask to the maps and computes the cost matrix using the Fourier Shell Correlation.
+        """
         maps_gt_flat = maps1
         maps_user_flat = maps2
         n_pix = self.config["data"]["n_pix"]
@@ -242,7 +259,13 @@ def get_computed_assets(self, maps1, maps2, global_store_of_running_results):
         return self.stored_computed_assets  # must run get_distance_matrix first
 
 
-class ResDistance(MapToMapDistance):
+class FSCResDistance(MapToMapDistance):
+    """FSC Resolution distance.
+
+    The resolution at which the Fourier Shell Correlation reaches 0.5.
+    Built on top of the FSCDistance class. This needs to be run first and store the FSC matrix in the computed assets.
+    """
+
     def __init__(self, config):
         super().__init__(config)
 

src/cryo_challenge/_map_to_map/map_to_map_pipeline.py

@@ -9,7 +9,7 @@
     Correlation,
     L2DistanceSum,
     BioEM3dDistance,
-    ResDistance,
+    FSCResDistance,
 )
 
 
@@ -18,7 +18,7 @@
     "corr": Correlation,
     "l2": L2DistanceSum,
     "bioem": BioEM3dDistance,
-    "res": ResDistance,
+    "res": FSCResDistance,
 }