add invert options based on weight or distance

mesoscope · Oct 9, 2023 · 469ebe6 · 469ebe6
1 parent 01424f2
commit 469ebe6
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/cellpack/autopack/Gradient.py b/cellpack/autopack/Gradient.py
@@ -207,6 +207,9 @@ def set_weights_by_mode(self):
 
         self.scaled_distances = self.get_normalized_values(self.distances)
 
+        if self.invert == "distance":
+            self.scaled_distances = 1.0 - self.scaled_distances
+
         if (max(self.scaled_distances) > 1.0) or (min(self.scaled_distances) < 0.0):
             raise ValueError(
                 "CHECK CALCULATED DISTANCES",
@@ -231,7 +234,7 @@ def set_weights_by_mode(self):
 
         self.weight[numpy.isnan(self.weight)] = 0
 
-        if self.invert:
+        if self.invert == "weight":
             self.weight = 1.0 - self.weight
 
         # TODO: talk to Ludo about calculating gaussian weights

diff --git a/cellpack/autopack/interface_objects/default_values.py b/cellpack/autopack/interface_objects/default_values.py
@@ -9,7 +9,7 @@
     "pick_mode": "linear",
     "description": "Linear gradient in the X direction",
     "reversed": False,  # is the direction of the vector reversed?
-    "invert": False,  # is the gradient inverted? (this does weights = 1 - weights)
+    "invert": None,  # options: "weight", "distance"
     "mode_settings": {},
     "weight_mode_settings": {},
 }
diff --git a/cellpack/autopack/interface_objects/gradient_data.py b/cellpack/autopack/interface_objects/gradient_data.py
@@ -60,6 +60,15 @@ class ModeOptions(MetaEnum):
     scale_distance_between = "scale_distance_between"
 
 
+class InvertOptions(MetaEnum):
+    """
+    All available options for individual invert modes
+    """
+
+    weight = "weight"
+    distance = "distance"
+
+
 class WeightModeOptions(MetaEnum):
     """
     All available options for individual weight modes
@@ -118,6 +127,7 @@ def validate_gradient_data(self, gradient_data):
         self.validate_weight_mode_settings(
             gradient_data["weight_mode"], gradient_data.get("weight_mode_settings")
         )
+        self.validate_invert_settings(gradient_data["invert"])
 
     def validate_mode_settings(self, mode_name, mode_settings_dict):
         required_options = REQUIRED_MODE_OPTIONS.get(mode_name)
@@ -151,6 +161,16 @@ def validate_weight_mode_settings(
                     f"Missing required weight mode setting {option} for {weight_mode_name}"
                 )
 
+    def validate_invert_settings(
+        self,
+        invert_option,
+    ):
+        if not invert_option:
+            return
+
+        if not InvertOptions.is_member(invert_option):
+            raise ValueError(f"Invalid gradient invert option: {invert_option}")
+
     def set_mode_properties(self, gradient_data):
         if not gradient_data.get("mode_settings"):
             gradient_data["mode_settings"] = {}

diff --git a/cellpack/tests/recipes/v2/test_mesh_image_gradient.json b/cellpack/tests/recipes/v2/test_mesh_image_gradient.json
@@ -20,7 +20,7 @@
             "weight_mode": "exponential",
             "pick_mode": "rnd",
             "mode": "vector",
-            "invert": true,
+            "invert": "weight",
             "mode_settings": {
                 "direction": [
                     0.707,
@@ -34,7 +34,7 @@
                 ]
             },
             "weight_mode_settings": {
-                "decay_length": 0.05
+                "decay_length": 0.3
             }
         }
     },    
@@ -61,7 +61,7 @@
                 1,
                 1
             ],
-            "radius": 0.1,
+            "radius": 1,
             "packing_mode": "gradient",
             "gradient": "planar_gradient"
         }