fixed merge conflict

LFPy · Jan 17, 2017 · 6e3ade1 · 6e3ade1
2 parents 0ec8b51 + 96233f4
commit 6e3ade1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/LFPy/cell.py b/LFPy/cell.py
@@ -207,9 +207,10 @@ def __init__(self, morphology,
             self.x3d, self.y3d, self.z3d, self.diam3d = self._collect_pt3d()
 
         #Gather geometry, set position and rotation of morphology
-        if pt3d:
+        if self.pt3d:
             self._update_pt3d()
-        self._collect_geometry()
+        else: # self._update_pt3d itself makes a call to self._collect_geometry()
+            self._collect_geometry()
         if hasattr(self, 'somapos'):
             self.set_pos()
         else: