Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "hatchling.build"

[project]
name = "skeliner"
version = "0.2.3"
version = "0.2.4"
description = "A lightweight neuromorphological mesh skeletonizer."
authors = []
requires-python = ">=3.10.0"
Expand Down
9 changes: 9 additions & 0 deletions skeliner/post.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ def _remap_ntype(
mapped[new_idx] = ntype[old_idx]
if new_len:
mapped[0] = 1
# keep soma label unique (some remaps move old node 0 away from index 0)
dupes = (mapped == 1)
dupes[0] = False
if np.any(dupes):
mapped[dupes] = 3
return mapped


Expand Down Expand Up @@ -708,6 +713,10 @@ def reroot(

if set_soma_ntype and ntype is not None:
ntype[0] = 1
if len(ntype) > 1:
dupes = (ntype == 1)
dupes[0] = False
ntype[dupes] = 3

new_skel = Skeleton(
soma=new_soma,
Expand Down
28 changes: 28 additions & 0 deletions tests/test_post.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ def test_reroot_updates_soma_and_ntype():
s.soma.axes[0], s.radii["median"][0]
) # radius equals selected column
assert s.ntype[0] == 1
assert int(np.sum(s.ntype == 1)) == 1


def test_reroot_node2verts_vert2node_consistency():
Expand All @@ -125,3 +126,30 @@ def test_reroot_node2verts_vert2node_consistency():
assert s.vert2node[v] == i
# Soma verts now come from the new node 0's membership
assert set(s.soma.verts.tolist()) == set(s.node2verts[0].tolist())


def test_detect_soma_remaps_ntype_once():
nodes = np.array([[0, 0, 0], [0, 0, 5], [0, 5, 0]], float)
edges = np.array([[0, 1], [1, 2]], np.int64)
radii = {"median": np.array([1.0, 4.0, 1.5])}
skel = Skeleton(
soma=Soma.from_sphere(nodes[0], radii["median"][0], verts=None),
nodes=nodes,
radii=radii,
edges=edges,
ntype=np.array([1, 3, 3], np.int8),
)

s = post.detect_soma(
skel,
radius_key="median",
soma_radius_percentile_threshold=90.0,
soma_radius_distance_factor=4.0,
soma_min_nodes=1,
verbose=False,
mesh_vertices=None,
)

assert np.allclose(s.nodes[0], nodes[1]) # new soma promoted
assert s.ntype[0] == 1
assert int(np.sum(s.ntype == 1)) == 1