Changeset ee60aa7 in sasmodels for sasmodels/models/core_shell_bicelle_elliptical_belt_rough.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_bicelle_elliptical_belt_rough.c (modified) (1 diff)

sasmodels/models/core_shell_bicelle_elliptical_belt_rough.c

@@ -30 +30 @@
 effective_radius(int mode, double r_minor, double x_core, double thick_rim, double thick_face, double length)
 {
-    if (mode == 1) {
+    switch (mode) {
+    case 1: // equivalent sphere
         return radius_from_volume(r_minor, x_core, thick_rim, thick_face, length);
-    } else if (mode == 2) {
+    case 2: // outer rim average radius
         return 0.5*r_minor*(1.0 + x_core) + thick_rim;
-    } else if (mode == 3) {
+    case 3: // outer rim min radius
         return (x_core < 1.0 ? x_core*r_minor+thick_rim : r_minor+thick_rim);
-    } else if (mode == 4) {
+    case 4: // outer max radius
         return (x_core > 1.0 ? x_core*r_minor+thick_rim : r_minor+thick_rim);
-    } else if (mode ==5) {
+    case 5: // half outer thickness
         return 0.5*length + thick_face;
-    } else {
+    case 6: // half diagonal
         return radius_from_diagonal(r_minor,x_core,thick_rim,thick_face,length);
     }