fix+test: ensure correct return type for 2d

seung-lab · Feb 19, 2024 · cdd91ca · cdd91ca
1 parent add8ee3
commit cdd91ca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/automated_test.py b/automated_test.py
@@ -382,6 +382,15 @@ def test_2d():
     area = xs3d.cross_sectional_area(labels, [0,0], [-1,1], [1,1])
     assert np.isclose(area, 3 * np.sqrt(2))
 
+    area = xs3d.cross_sectional_area(labels, [-1,0], [-1,1], [1,1])
+    assert area == 0
+
+    area = xs3d.cross_sectional_area(labels, [1,-1], [-1,1], [1,1])
+    assert area == 0
+
+    labels[1,1] = 0
+    area = xs3d.cross_sectional_area(labels, [1,1], [0,1], [1,1])
+    assert area == 0
 
 
 
diff --git a/xs3d/twod.py b/xs3d/twod.py
@@ -78,13 +78,13 @@ def cross_sectional_area_2d(
   sx, sy = binimg.shape
 
   if pos[0] >= sx or pos[0] < 0:
-    return 0.0
+    return [0.0, 0b00111111]
 
   if pos[1] >= sy or pos[1] < 0:
-    return 0.0
+    return [0.0, 0b00111111]
 
   if binimg[int(pos[0]), int(pos[1])] == False:
-    return 0.0
+    return [0.0, 0b00111111]
 
   nhat = np.array([ -vec[1], vec[0] ], dtype=np.float32)
   nhat = nhat / np.sqrt(nhat[0] ** 2 + nhat[1] ** 2)