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

Timestamp:

Feb 7, 2017 12: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 12:10:50)

git-committer:

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

Message:

Merge branch 'master' into ticket-815

File:

• sasmodels/models/stacked_disks.c (modified) (1 diff)

sasmodels/models/stacked_disks.c

@@ -26 +26 @@
     const double sinarg2 = q*(halfheight+thick_layer)*cos_alpha;
 
-    const double be1 = sas_J1c(besarg1);
-    //const double be2 = sas_J1c(besarg2);
+    const double be1 = sas_2J1x_x(besarg1);
+    //const double be2 = sas_2J1x_x(besarg2);
     const double be2 = be1;
-    const double si1 = sinc(sinarg1);
-    const double si2 = sinc(sinarg2);
+    const double si1 = sas_sinx_x(sinarg1);
+    const double si2 = sas_sinx_x(sinarg2);
 
     const double dr1 = core_sld - solvent_sld;