Changeset 5772737 in sasmodels

Timestamp:

Oct 4, 2017 2:29:21 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

a8631ca

Parents:

237c9cf

Message:

flexible_cylinder: improve low q Sdebye calculation; adjust code so different branches use the same equation numbers

File:

• sasmodels/models/lib/wrc_cyl.c (modified) (2 diffs)

sasmodels/models/lib/wrc_cyl.c

@@ -26 +26 @@
 {
     // Pedersen eq. 16:
-    //    w = 1 - [1 + tanh((x-C4)/C5)]/2
+    //    w = [1 + tanh((x-C4)/C5)]/2
     const double C4 = 1.523;
     const double C5 = 0.1477;
@@ -150 +150 @@
     const double qr_miu = pow(qr, -1.0/miu);
     const double w = w_WR(qr);
-    const double t10 = qr*Sdebye(qr*qr)*(1.0 - w);
+    const double t10 = Sdebye(qr*qr)*(1.0 - w);
     const double t11 = ((C3*qr_miu + C2)*qr_miu + C1)*qr_miu;