Changeset 86aa992 in sasmodels for sasmodels/models/onion.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/onion.c (modified) (2 diffs)

sasmodels/models/onion.c

@@ -40 +40 @@
 }
 
-static double
-Iq(double q, double sld_core, double radius_core, double sld_solvent,
+static void
+Fq(double q, double *F1, double *F2, double sld_core, double radius_core, double sld_solvent,
     double n_shells, double sld_in[], double sld_out[], double thickness[],
     double A[])
@@ -55 +55 @@
   }
   f -= f_exp(q, r_out, sld_solvent, 0.0, 0.0, 0.0, 0.0);
-  const double f2 = f * f * 1.0e-4;
 
-  return f2;
+  *F1 = 1e-2 * f;
+  *F2 = 1e-4 * f * f;
 }