Changeset e9b1663d in sasmodels for sasmodels/models/cylinder.c

Timestamp:

Mar 23, 2016 1:02:10 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

76a9ffe

Parents:

69aa451 (diff), 34edbb8 (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.

Message:

pull from master

File:

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

sasmodels/models/cylinder.c

@@ -30 +30 @@
         double sn, cn;
         SINCOS(alpha, sn, cn);
-        const double fq = sinc(qh*cn) * J1c(qr*sn);
+        const double fq = sinc(qh*cn) * sas_J1c(qr*sn);
         total += Gauss76Wt[i] * fq*fq * sn;
     }
@@ -57 +57 @@
 
     SINCOS(alpha, sn, cn);
-    const double fq = sinc(q*0.5*length*cn) * J1c(q*radius*sn);
+    const double fq = sinc(q*0.5*length*cn) * sas_J1c(q*radius*sn);
     const double s = (sld-solvent_sld) * form_volume(radius, length);
     return 1.0e-4 * square(s * fq);