Changeset 99658f6 in sasmodels for sasmodels/models/core_shell_ellipsoid.c

Timestamp:

Nov 6, 2018 4:10:43 PM (5 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:

cf3d0ce

Parents:

5024a56

Message:

updated ER functions including cylinder excluded volume, to match 4.x

File:

• sasmodels/models/core_shell_ellipsoid.c (modified) (1 diff)

sasmodels/models/core_shell_ellipsoid.c

@@ -75 +75 @@
     switch (mode) {
     default:
-    case 1: // equivalent sphere
+    case 1: // average outer curvature
+        return radius_from_curvature(radius_equat_core, x_core, thick_shell, x_polar_shell);
+    case 2: // equivalent volume sphere
         return radius_from_volume(radius_equat_core, x_core, thick_shell, x_polar_shell);
-    case 2: // average outer curvature
-        return radius_from_curvature(radius_equat_core, x_core, thick_shell, x_polar_shell);
     case 3: // min outer radius
         return (radius_polar_tot < radius_equat_tot ? radius_polar_tot : radius_equat_tot);