Changeset 95ce773 in sasmodels for explore

Timestamp:

Mar 18, 2016 12:45:38 PM (8 years ago)

Author:

wojciech

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:

9f7a852

Parents:

a629d8e

Message:

Bessel functions clean-up

Location:

explore

Files:

• J1.py (modified) (1 diff)
• J1c.py (modified) (1 diff)

explore/J1.py

@@ -50 +50 @@
     model = core.load_model('bessel', dtype=dtype)
     calculator = direct_model.DirectModel(data.empty_data1D(x), model)
-    #ret = calculator(background=0)
-    #print ret
+
     return calculator(background=0)
 

explore/J1c.py

@@ -2 +2 @@
 Show numerical precision of $2 J_1(x)/x$.
 """
+import sys; sys.path.insert(0, '..')
 
 import numpy as np
-from sympy.mpmath import mp
+try:
+    from mpmath import mp
+except:
+    # CRUFT: mpmath split out into its own package
+    from sympy.mpmath import mp
 #import matplotlib; matplotlib.use('TkAgg')
 import pylab