Changeset d277229 in sasmodels for sasmodels/models/ellipsoid.c

Timestamp:

Sep 7, 2018 3:29:38 AM (6 years ago)

Author:

grethevj

Branches:

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

Children:

3c60146

Parents:

2a12351b

Message:

Models updated to include choices for effective interaction radii

File:

• sasmodels/models/ellipsoid.c (modified) (3 diffs)

sasmodels/models/ellipsoid.c

@@ -4 +4 @@
     return M_4PI_3*radius_polar*radius_equatorial*radius_equatorial;
 }
-
 
 static double
@@ -20 +19 @@
 
     // see equation (26) in A.Isihara, J.Chem.Phys. 18(1950)1446-1449
-    const double ratio = (radius_polar < radius_equatorial 
+    const double ratio = (radius_polar < radius_equatorial
                           ? radius_polar / radius_equatorial
                           : radius_equatorial / radius_polar);
@@ -36 +35 @@
 {
     if (mode == 1) {
+        return radius_from_volume(radius_polar, radius_equatorial);
+    } else if (mode == 2) {
         return radius_from_curvature(radius_polar, radius_equatorial);
-    } else if (mode == 2) {
-        return radius_from_volume(radius_polar, radius_equatorial);
     } else if (mode == 3) {
         return (radius_polar < radius_equatorial ? radius_polar : radius_equatorial);