Changeset a90aa1c in sasmodels for sasmodels/models/spherical_sld.c

Timestamp:

Feb 7, 2017 2:45:34 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

5467cd8

Parents:

c3ccaec (diff), 1105286 (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 ticket-815

File:

• sasmodels/models/spherical_sld.c (modified) (4 diffs)

sasmodels/models/spherical_sld.c

@@ -1 +1 @@
 static double form_volume(
-    int n_shells,
+    double fp_n_shells,
     double thickness[],
     double interface[])
 {
+    int n_shells= (int)(fp_n_shells + 0.5);
     double r = 0.0;
     for (int i=0; i < n_shells; i++) {
@@ -20 +21 @@
         return pow(z, nu);
     } else if (shape==2) {
-        return 1.0 - pow(1. - z, nu);
+        return 1.0 - pow(1.0 - z, nu);
     } else if (shape==3) {
         return expm1(-nu*z)/expm1(-nu);
@@ -44 +45 @@
 static double Iq(
     double q,
-    int n_shells,
+    double fp_n_shells,
     double sld_solvent,
     double sld[],
@@ -51 +52 @@
     double shape[],
     double nu[],
-    int n_steps)
+    double fp_n_steps)
 {
     // iteration for # of shells + core + solvent
+    int n_shells = (int)(fp_n_shells + 0.5);
+    int n_steps = (int)(fp_n_steps + 0.5);
     double f=0.0;
     double r=0.0;