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

sasmodels/models/cylinder.c

@@ -28 +28 @@
 effective_radius(int mode, double radius, double length)
 {
-    if (mode == 1) {
+    switch (mode) {
+    case 1:
         return radius_from_volume(radius, length);
-    } else if (mode == 2) {
+    case 2:
         return radius;
-    } else if (mode == 3) {
+    case 3:
         return 0.5*length;
-    } else if (mode == 4) {
+    case 4:
         return (radius < 0.5*length ? radius : 0.5*length);
-    } else if (mode == 5) {
+    case 5:
         return (radius > 0.5*length ? radius : 0.5*length);
-    } else {
+    case 6:
         return radius_from_diagonal(radius,length);
     }