Merge pull request #1070 from AFM-SPM/llwiggins/1066-fix-mask-fragmen…

…tation Combine grain crops rather than overwriting them
AFM-SPM · Jan 9, 2025 · a480afe · a480afe
2 parents 980b1c2 + a21dbf5
commit a480afe
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/topostats/grains.py b/topostats/grains.py
@@ -1331,11 +1331,12 @@ def assemble_grain_mask_tensor_from_crops(
             ]
 
             # Update the grain mask tensor
-            grain_mask_tensor[
-                min_row + padding : max_row - padding,
-                min_col + padding : max_col - padding,
-                :,
-            ] = cropped_grain
+            grain_mask_tensor[min_row + padding : max_row - padding, min_col + padding : max_col - padding, :] = (
+                np.maximum(
+                    grain_mask_tensor[min_row + padding : max_row - padding, min_col + padding : max_col - padding, :],
+                    cropped_grain,
+                )
+            )
 
         # Update the background class
         grain_mask_tensor = Grains.update_background_class(grain_mask_tensor)