Changeset 2773c66 in sasmodels for sasmodels/models/ellipsoid.py

Timestamp:

Sep 8, 2018 10:29:05 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:

ba51e00

Parents:

b763f9d (diff), c88f983 (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 'beta_approx' into beta_approx_new_R_eff

File:

• sasmodels/models/ellipsoid.py (modified) (1 diff)

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"