Changeset ee60aa7 in sasmodels for sasmodels/models/core_shell_ellipsoid.c

Timestamp:

Sep 10, 2018 4:16:46 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:

d299327

Parents:

3f818b2

Message:

clean up effective radius functions; improve mono_gauss_coil accuracy; start moving VR into C

File:

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

sasmodels/models/core_shell_ellipsoid.c

@@ -73 +73 @@
     const double radius_polar_tot = radius_equat_core*x_core + thick_shell*x_polar_shell;
 
-    if (mode == 1) {
+    switch (mode) {
+    case 1: // equivalent sphere
         return radius_from_volume(radius_equat_core, x_core, thick_shell, x_polar_shell);
-    } else if (mode == 2) {
+    case 2: // average outer curvature
         return radius_from_curvature(radius_equat_core, x_core, thick_shell, x_polar_shell);
-    } else if (mode == 3) {
+    case 3: // min outer radius
         return (radius_polar_tot < radius_equat_tot ? radius_polar_tot : radius_equat_tot);
-    } else {
+    case 4: // max outer radius
         return (radius_polar_tot > radius_equat_tot ? radius_polar_tot : radius_equat_tot);
     }