Changeset 4b541ac in sasmodels

Timestamp:

Jan 11, 2017 7:01:30 AM (7 years ago)

Author:

wojciech

Branches:

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

Children:

391aba4

Parents:

592343f

Message:

sas_Si fixes in py files

Location:

sasmodels/models

Files:

• core_shell_bicelle.py (modified) (1 diff)
• core_shell_bicelle_elliptical.py (modified) (1 diff)
• pearl_necklace.c (modified) (1 diff)
• pearl_necklace.py (modified) (1 diff)

sasmodels/models/core_shell_bicelle.py

@@ -141 +141 @@
 # pylint: enable=bad-whitespace, line-too-long
 
-source = ["lib/Si.c", "lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c",
+source = ["lib/sas_Si.c", "lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c",
           "core_shell_bicelle.c"]
 

sasmodels/models/core_shell_bicelle_elliptical.py

@@ -132 +132 @@
 # pylint: enable=bad-whitespace, line-too-long
 
-source = ["lib/Si.c", "lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c","core_shell_bicelle_elliptical.c"]
+source = ["lib/sas_Si.c", "lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c",
+          "core_shell_bicelle_elliptical.c"]
 
 demo = dict(scale=1, background=0,

sasmodels/models/pearl_necklace.c

@@ -34 +34 @@
     // But there is a 1/(1-sinc) term below which blows up so don't bother
     const double q_edge = q * edge_sep;
-    const double beta = (Si(q*(A_s-radius)) - Si(q*radius)) / q_edge;
-    const double gamma = Si(q_edge) / q_edge;
+    const double beta = (sas_Si(q*(A_s-radius)) - sas_Si(q*radius)) / q_edge;
+    const double gamma = sas_Si(q_edge) / q_edge;
     const double psi = sas_3j1x_x(q*radius);
 

sasmodels/models/pearl_necklace.py

@@ -92 +92 @@
              ]
 
-source = ["lib/Si.c", "lib/sas_3j1x_x.c", "pearl_necklace.c"]
+source = ["lib/sas_Si.c", "lib/sas_3j1x_x.c", "pearl_necklace.c"]
 single = False  # use double precision unless told otherwise