Changeset 0168844 in sasmodels

Timestamp:

Aug 17, 2018 10:27:32 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

bd7630d, 39c2de9, 70530778

Parents:

2e6d7c8

Message:

older versions of numpy do not have the cube root function cbrt

File:

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

sasmodels/models/ellipsoid.py

@@ -125 +125 @@
 import numpy as np
 from numpy import inf, sin, cos, pi
+
+try:
+    from numpy import cbrt
+except ImportError:
+    def cbrt(x): return x ** (1.0/3.0)
 
 name = "ellipsoid"
@@ -180 +185 @@
 
     r = np.zeros_like(radius_polar)
-    r[valid] = 0.5 * np.cbrt(ddd)
+    r[valid] = 0.5 * cbrt(ddd)
     idx = radius_polar == radius_equatorial
     r[idx] = radius_polar[idx]