Changeset 3c60146 in sasmodels

Timestamp:

Sep 7, 2018 4:08:32 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:

c11d09f

Parents:

d277229

Message:

minor change in effective_radius()

File:

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

sasmodels/models/core_shell_ellipsoid.c

@@ -49 +49 @@
 {
     // Trivial cases
-    if (x_core == x_polar_shell == 1.0) return radius_equat_core + thick_shell;
+    if (1.0 == x_core && 1.0 == x_polar_shell) return radius_equat_core + thick_shell;
     if ((radius_equat_core + thick_shell)*(radius_equat_core*x_core + thick_shell*x_polar_shell) == 0.)  return 0.;
 
@@ -70 +70 @@
 effective_radius(int mode, double radius_equat_core, double x_core, double thick_shell, double x_polar_shell)
 {
+    const double radius_equat_tot = radius_equat_core + thick_shell;
+    const double radius_polar_tot = radius_equat_core*x_core + thick_shell*x_polar_shell;
+
     if (mode == 1) {
         return radius_from_volume(radius_equat_core, x_core, thick_shell, x_polar_shell);
@@ -75 +78 @@
         return radius_from_curvature(radius_equat_core, x_core, thick_shell, x_polar_shell);
     } else if (mode == 3) {
-        const double radius_equat_tot = radius_equat_core + thick_shell;
-        const double radius_polar_tot = radius_equat_core*x_core + thick_shell*x_polar_shell;
         return (radius_polar_tot < radius_equat_tot ? radius_polar_tot : radius_equat_tot);
     } else {
-        const double radius_equat_tot = radius_equat_core + thick_shell;
-        const double radius_polar_tot = radius_equat_core*x_core + thick_shell*x_polar_shell;
         return (radius_polar_tot > radius_equat_tot ? radius_polar_tot : radius_equat_tot);
     }