Changeset c036ddb in sasmodels for sasmodels/models/ellipsoid.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/ellipsoid.c (modified) (4 diffs)

sasmodels/models/ellipsoid.c

@@ -5 +5 @@
 }
 
+/* Fq overrides Iq
 static  double
 Iq(double q,
@@ -20 +21 @@
     //     i(h) = int_0^1 Phi^2(h a sqrt(1 + u^2(v^2-1)) du
     const double v_square_minus_one = square(radius_polar/radius_equatorial) - 1.0;
-  
+
     // translate a point in [-1,1] to a point in [0, 1]
     // const double u = GAUSS_Z[i]*(upper-lower)/2 + (upper+lower)/2;
@@ -36 +37 @@
     const double s = (sld - sld_solvent) * form_volume(radius_polar, radius_equatorial);
     return 1.0e-4 * s * s * form;
-} 
+}
+*/
 
 static void
@@ -72 +74 @@
     const double form_avg = total_F1*zm;
     const double s = (sld - sld_solvent) * form_volume(radius_polar, radius_equatorial);
+    *F1 = 1e-2 * s * form_avg;
     *F2 = 1e-4 * s * s * form_squared_avg;
-    *F1 = 1e-2 * s * form_avg;
 }
-
-
-
-
-
 
 static double