Changeset 7d4b2ae in sasmodels for sasmodels/models/core_shell_sphere.c

Timestamp:

Mar 8, 2016 6:59:23 AM (8 years ago)

Author:

piotr

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:

5a483877

Parents:

ad90df9

Message:

Added fractal_core_shell

File:

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

sasmodels/models/core_shell_sphere.c

@@ -5 +5 @@
 
 double Iq(double q, double radius, double thickness, double core_sld, double shell_sld, double solvent_sld) {
-    // Core first, then add in shell
-    const double core_qr = q * radius;
-    const double core_contrast = core_sld - shell_sld;
-    const double core_bes = sph_j1c(core_qr);
-    const double core_volume = 4.0 * M_PI / 3.0 * radius * radius * radius;
-    double f = core_volume * core_bes * core_contrast;
 
-    // Now the shell
-    const double shell_qr = q * (radius + thickness);
-    const double shell_contrast = shell_sld - solvent_sld;
-    const double shell_bes = sph_j1c(shell_qr);
-    const double shell_volume = 4.0 * M_PI / 3.0 * pow((radius + thickness), 3);
-    f += shell_volume * shell_bes * shell_contrast;
-    return f * f * 1.0e-4;
+
+    double intensity = core_shell_kernel(q,
+                              radius,
+                              thickness,
+                              core_sld,
+                              shell_sld,
+                              solvent_sld);
+    return intensity;
 }