Changeset 71b751d in sasmodels for sasmodels/models/multilayer_vesicle.c

Timestamp:

Aug 14, 2018 10:09:34 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

86aa992

Parents:

2f8cbb9

Message:

update remaining form factors to use Fq interface

File:

• sasmodels/models/multilayer_vesicle.c (modified) (4 diffs)

sasmodels/models/multilayer_vesicle.c

@@ -12 +12 @@
 static double
 multilayer_vesicle_kernel(double q,
-          double volfraction,
           double radius,
           double thick_shell,
@@ -45 +44 @@
                                //unilamellar vesicles (C. Glinka, 11/24/03)
 
-    return 1.0e-4*volfraction*fval*fval;  // Volume normalization happens in caller
+    return fval;  // Volume normalization happens in caller
 }
 
-static double
-Iq(double q,
+static void
+Fq(double q,
+          double *F1,
+          double *F2,
           double volfraction,
           double radius,
@@ -59 +60 @@
 {
     int n_shells = (int)(fp_n_shells + 0.5);
-    return multilayer_vesicle_kernel(q,
-           volfraction,
+    const double fq = multilayer_vesicle_kernel(q,
            radius,
            thick_shell,
@@ -67 +67 @@
            sld,
            n_shells);
+    // See comment in vesicle.c regarding volfraction normalization.
+    *F1 = 1.0e-2 * sqrt(volfraction)*fq;
+    *F2 = 1.0e-4 * volfraction*fq*fq;
 }