Changeset 416609b in sasmodels for sasmodels/models/elliptical_cylinder.py

Timestamp:

Apr 8, 2016 12:14:58 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, a936688, 1ca1fd9

Parents:

65279d8

Message:

use np.sqrt rather than math.sqrt for vector functions

File:

• sasmodels/models/elliptical_cylinder.py (modified) (2 diffs)

sasmodels/models/elliptical_cylinder.py

@@ -81 +81 @@
 """
 
-import math
-from numpy import pi, inf
+from numpy import pi, inf, sqrt
 
 name = "elliptical_cylinder"
@@ -117 +116 @@
         @param length: Length of the cylinder
     """
-    radius = math.sqrt(r_minor * r_minor * axis_ratio)
+    radius = sqrt(r_minor * r_minor * axis_ratio)
     ddd = 0.75 * radius * (2 * radius * length + (length + radius) * (length + pi * radius))
     return 0.5 * (ddd) ** (1. / 3.)