Changeset c3ccaec in sasmodels for sasmodels/models/linear_pearls.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/linear_pearls.c (modified) (1 diff)

sasmodels/models/linear_pearls.c

@@ -44 +44 @@
 
     //sine functions of a pearl
-    double psi = sph_j1c(q * radius);
+    double psi = sas_3j1x_x(q * radius);
 
     // N pearls interaction terms 
     double structure_factor = (double)num_pearls;
     for(int num=1; num<num_pearls; num++) {
-        structure_factor += 2.0*(num_pearls-num)*sinc(q*separation*num);
+        structure_factor += 2.0*(num_pearls-num)*sas_sinx_x(q*separation*num);
     }
     // form factor for num_pearls