Changeset 86aa992 in sasmodels for sasmodels/models/fractal_core_shell.c

Timestamp:

Aug 14, 2018 12:09:49 PM (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:

6d90684

Parents:

71b751d (diff), d089a00 (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:

Merge branch 'master' into beta_approx

File:

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

sasmodels/models/fractal_core_shell.c

@@ -16 +16 @@
    double cor_length)
 {
-    //The radius for the building block of the core shell particle that is 
+    //The radius for the building block of the core shell particle that is
     //needed by the Teixeira fractal S(q) is the radius of the whole particle.
     const double cs_radius = radius + thickness;
     const double sq = fractal_sq(q, cs_radius, fractal_dim, cor_length);
-    const double pq = core_shell_kernel(q, radius, thickness,
-                                        core_sld, shell_sld, solvent_sld);
+    const double fq = core_shell_fq(q, radius, thickness,
+                                    core_sld, shell_sld, solvent_sld);
 
     // Note: core_shell_kernel already performs the 1e-4 unit conversion
-    return volfraction * sq * pq;
+    return 1.0e-4 * volfraction * sq * fq * fq;
 }
-