Changeset c036ddb in sasmodels for sasmodels/models/sphere.c

Timestamp:

Aug 7, 2018 8:45:45 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:

7e923c2

Parents:

7b0abf8

Message:

refactor so Iq is not needed if Fq is defined

File:

• sasmodels/models/sphere.c (modified) (2 diffs)

sasmodels/models/sphere.c

@@ -4 +4 @@
 }
 
+// TODO: remove Iq when Iqxy can use Fq directly
 static double Iq(double q, double sld, double sld_solvent, double radius)
 {
@@ -11 +12 @@
 static void Fq(double q, double *F1,double *F2, double sld, double solvent_sld, double radius)
 {
-    const double fq = sphere_volume(radius) * sas_3j1x_x(q*radius);
+    const double fq = sas_3j1x_x(q*radius);
     const double contrast = (sld - solvent_sld);
-    const double form = 1e-2*contrast * fq;
-    *F1= form;
+    const double form = 1e-2 * contrast * sphere_volume(radius) * fq;
+    *F1 = form;
     *F2 = form*form;
 }