Changeset 859567e in sasmodels

Timestamp:

Apr 17, 2017 9:31:41 AM (7 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:

cb038a2

Parents:

e755d8a

Message:

explore quadrature options for bcc at low q

Files:

• explore/bccpy.py (added)
• sasmodels/special.py (modified) (8 diffs)

sasmodels/special.py

@@ -286 +286 @@
     retvalue = 3*sas_j1(x)/x
     retvalue[x==0] = 1.
-    
+
 def sas_2J1x_x(x):
     retvalue = 2*sas_J1(x)/x
@@ -294 +294 @@
 # Gaussians
 
-Gauss20Wt = [
+Gauss20Wt = np.array([
         .0176140071391521,
         .0406014298003869,
@@ -315 +315 @@
         .0406014298003869,
         .0176140071391521
-]
-
-Gauss20Z = [
+])
+
+Gauss20Z = np.array([
         -.993128599185095,
         -.963971927277914,
@@ -338 +338 @@
         .963971927277914,
         .993128599185095
-]
-
-Gauss76Wt = [
+])
+
+Gauss76Wt = np.array([
         .00126779163408536,             #0
         .00294910295364247,
@@ -417 +417 @@
         .00294910295364247,
         .00126779163408536              #75 (indexed from 0)
-]
-
-Gauss76Z = [
+])
+
+Gauss76Z = np.array([
         -.999505948362153,              #0
         -.997397786355355,
@@ -496 +496 @@
         .997397786355355,
         .999505948362153                #75
-]
-
-Gauss150Z = [
+])
+
+Gauss150Z = np.array([
         -0.9998723404457334,
         -0.9993274305065947,
@@ -649 +649 @@
         0.9993274305065947,
         0.9998723404457334
-]
-
-Gauss150Wt = [
+])
+
+Gauss150Wt = np.array([
         0.0003276086705538,
         0.0007624720924706,
@@ -802 +802 @@
         0.0007624720924706,
         0.0003276086705538
-]
-
+])