Merge pull request #322 from JoQCcoz/adding_tags

Bug fixes
NIEHS · Aug 23, 2024 · 947b1f3 · 947b1f3
2 parents a72ce71 + cd95f05
commit 947b1f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Smartscope/core/main_commands.py b/Smartscope/core/main_commands.py
@@ -50,7 +50,7 @@ def run_selectors(square_id):
     protocol = get_or_set_protocol(square.grid_id).square.targets
     montage = Montage(name=square.name, working_dir=square.grid_id.directory)
     montage.load_or_process()
-    selector_wrapper(protocol.selectors, square, n_groups=5, montage=montage)
+    selector_wrapper(protocol.selectors, square, montage=montage)
     cache_key = f'{square_id}_targets_methods'
     cache.delete(cache_key)
 

diff --git a/Smartscope/lib/image_manipulations.py b/Smartscope/lib/image_manipulations.py
@@ -40,7 +40,13 @@ def extract_from_image(image, center: np.array, apix: float, box_size: float = 2
 def extract_box_from_radius(image:np.array, x,y , radius: float, apix: float=-1.0):
     if apix != -1.0:
         radius = int(radius//apix)
-    return image[y - radius:y + radius, x - radius:x + radius]
+    up = max([0, y - radius])
+    left = max([0, x - radius])
+    down = min([image.shape[0], y + radius])
+    right = min([image.shape[1], x + radius])
+
+
+    return image[up:down, left:right]
 
 
 def to_8bits(image):