Changeset c88f983 in sasmodels for sasmodels/models/ellipsoid.py

Timestamp:

Sep 8, 2018 5:29:57 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

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

Children:

c11d09f, 0159b5e

Parents:

84f2962 (diff), 475ff58 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into beta_approx

File:

• sasmodels/models/ellipsoid.py (modified) (3 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"
@@ -172 +177 @@
     idx = radius_polar < radius_equatorial
     ee[idx] = (radius_equatorial[idx] ** 2 - radius_polar[idx] ** 2) / radius_equatorial[idx] ** 2
-    idx = radius_polar == radius_equatorial
-    ee[idx] = 2 * radius_polar[idx]
-    valid = (radius_polar * radius_equatorial != 0)
+    valid = (radius_polar * radius_equatorial != 0) & (radius_polar != radius_equatorial)
     bd = 1.0 - ee[valid]
     e1 = np.sqrt(ee[valid])
@@ -181 +184 @@
     b2 = 1.0 + bd / 2 / e1 * np.log(bL)
     delta = 0.75 * b1 * b2
-
-    ddd = np.zeros_like(radius_polar)
-    ddd[valid] = 2.0 * (delta + 1.0) * radius_polar * radius_equatorial ** 2
-    return 0.5 * ddd ** (1.0 / 3.0)
+    ddd = 2.0 * (delta + 1.0) * (radius_polar * radius_equatorial**2)[valid]
+
+    r = np.zeros_like(radius_polar)
+    r[valid] = 0.5 * cbrt(ddd)
+    idx = radius_polar == radius_equatorial
+    r[idx] = radius_polar[idx]
+    return r
 
 def random():