changed find_parent_seg

share/lib/python/neuron/rxd/geometry3d/FullJoinMorph.py

@@ -1,6 +1,8 @@
 import numpy
 import math
 
+import numpy as np
+
 from .ctng import constructive_neuronal_geometry
 from .graphicsPrimitives import (
     Sphere,
@@ -22,34 +24,18 @@
 
 
 def find_parent_seg(join, sdict, objects):
-
-    if not join:
-        return None
-    elif join[0] not in objects:
-        pseg = sdict[
-            (
-                join[0]._x0,
-                join[0]._y0,
-                join[0]._z0,
-                join[0]._x1,
-                join[0]._y1,
-                join[0]._z1,
-            )
-        ]
-        # better be all in same cell; so just set root once
-        h.distance(0, h.SectionRef(sec=pseg.sec).root(0))
-        closest = h.distance(pseg)
-
-    # any other possible instance?
-
+    root = None
+    pseg = None
+    closest = np.inf
     for item in join:
         if item not in objects:
             s = sdict[(item._x0, item._y0, item._z0, item._x1, item._y1, item._z1)]
-            d = h.distance(s)
+            if root is None:
+                root = h.SectionRef(sec=s.sec).root(0)
+            d = h.distance(root, s)
             if d < closest:
                 pseg = s
                 closest = d
-
     return pseg
 
 
@@ -69,17 +55,14 @@ def fullmorph(source, dx, soma_step=100, mesh_grid=None, relevant_pts=None):
     """Input: object source; arguments to pass to ctng
     Output: all voxels with SA and volume associated, categorized by segment"""
     source = list(source)
-    morphology = constructive_neuronal_geometry(
-        source, soma_step, dx, relevant_pts=relevant_pts
-    )
     (
         join_objects,
         cones,
         segment_dict,
         join_groups,
         object_pts,
         soma_objects,
-    ) = morphology
+    ) = constructive_neuronal_geometry(source, soma_step, dx, relevant_pts=relevant_pts)
 
     # grid setup
     if mesh_grid: