From 9ceda08f09adebbecbafd65ca5d840330b09937f Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Tue, 23 Jul 2024 19:47:38 +1200 Subject: [PATCH] Fix solidsphere2 creation of axes. --- src/scaffoldmaker/meshtypes/meshtype_3d_solidsphere2.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/scaffoldmaker/meshtypes/meshtype_3d_solidsphere2.py b/src/scaffoldmaker/meshtypes/meshtype_3d_solidsphere2.py index 0b12caf3..711a830c 100644 --- a/src/scaffoldmaker/meshtypes/meshtype_3d_solidsphere2.py +++ b/src/scaffoldmaker/meshtypes/meshtype_3d_solidsphere2.py @@ -5,7 +5,7 @@ from __future__ import division -from cmlibs.maths.vectorops import identity_matrix, matrix_vector_mult +from cmlibs.maths.vectorops import identity_matrix, matrix_vector_mult, matrix_mult, mult from cmlibs.utils.zinc.field import findOrCreateFieldCoordinates from scaffoldmaker.annotation.annotationgroup import AnnotationGroup from scaffoldmaker.meshtypes.scaffold_base import Scaffold_base @@ -173,7 +173,8 @@ def generateBaseMesh(region, options): annotationGroups = [boxGroup, transitionGroup] centre = [0.0, 0.0, 0.0] - axes = matrix_vector_mult(identity_matrix(3), radius) + identity = identity_matrix(3) + axes = [mult(identity[i], r) for i, r in enumerate(radius)] elementsCountAcross = [elementsCountAcrossAxis1, elementsCountAcrossAxis2, elementsCountAcrossAxis3] sphere1 = SphereMesh(fm, coordinates, centre, axes, elementsCountAcross,