Changeset 71b751d in sasmodels for sasmodels/models/fractal.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/fractal.c (modified) (2 diffs)

sasmodels/models/fractal.c

@@ -19 +19 @@
 
     //calculate P(q) for the spherical subunits
-    const double pq = square(form_volume(radius) * (sld_block-sld_solvent)
-                      *sas_3j1x_x(q*radius));
+    const double fq = form_volume(radius) * (sld_block-sld_solvent)
+                      *sas_3j1x_x(q*radius);
 
     // scale to units cm-1 sr-1 (assuming data on absolute scale)
@@ -27 +27 @@
     //    combined: 1e-4 * I(q)
 
-    return 1.e-4 * volfraction * sq * pq;
+    return 1.e-4 * volfraction * sq * fq * fq;
 }
-