Changeset c3ccaec in sasmodels for sasmodels/models/pearl_necklace.c

Timestamp:

Feb 7, 2017 2:10:50 PM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a90aa1c

Parents:

aa107ef (diff), fe8ff99 (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.

git-author:

Paul Kienzle <pkienzle@…> (02/07/17 14:10:50)

git-committer:

GitHub <noreply@…> (02/07/17 14:10:50)

Message:

Merge branch 'master' into ticket-815

File:

• sasmodels/models/pearl_necklace.c (modified) (2 diffs)

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 psi = sph_j1c(q*radius);
+    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);
 
     // Precomputed sinc terms
-    const double si = sinc(q*A_s);
+    const double si = sas_sinx_x(q*A_s);
     const double omsi = 1.0 - si;
     const double pow_si = pow(si, num_pearls);
@@ -54 +54 @@
         - 2.0 * (1.0 - pow_si/si)*beta*beta / (omsi*omsi)
         + 2.0 * num_strings*beta*beta / omsi
-        + num_strings * (2.0*gamma - square(sinc(q_edge/2.0)))
+        + num_strings * (2.0*gamma - square(sas_sinx_x(q_edge/2.0)))
         );