Changeset fbaef04 in sasmodels

Timestamp:

Sep 8, 2018 8:07:53 AM (6 years ago)

Author:

richardh

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

c11d09f

Parents:

a94046f

Message:

fixed bug ER function elliptical_cylinder

File:

• sasmodels/models/elliptical_cylinder.c (modified) (2 diffs)

sasmodels/models/elliptical_cylinder.c

@@ -16 +16 @@
 {
     const double rad_min = (r_ratio > 1.0 ? radius_minor : r_ratio*radius_minor);
-    return (rad_min < length ? rad_min : hlength);
+    return (rad_min < hlength ? rad_min : hlength);
 }
 
@@ -23 +23 @@
 {
     const double rad_max = (r_ratio < 1.0 ? radius_minor : r_ratio*radius_minor);
-    return (rad_max > length ? rad_max : hlength);
+    return (rad_max > hlength ? rad_max : hlength);
 }