Changeset a94046f in sasmodels for sasmodels/models/elliptical_cylinder.c

Timestamp:

Sep 8, 2018 8:55:23 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:

fbaef04

Parents:

b763f9d

Message:

some corrections to R_eff options

File:

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

sasmodels/models/elliptical_cylinder.c

@@ -13 +13 @@
 
 static double
-radius_from_min_dimension(double radius_minor, double r_ratio, double length)
+radius_from_min_dimension(double radius_minor, double r_ratio, double hlength)
 {
     const double rad_min = (r_ratio > 1.0 ? radius_minor : r_ratio*radius_minor);
-    return (rad_min < length ? rad_min : length);
+    return (rad_min < length ? rad_min : hlength);
 }
 
 static double
-radius_from_max_dimension(double radius_minor, double r_ratio, double length)
+radius_from_max_dimension(double radius_minor, double r_ratio, double hlength)
 {
     const double rad_max = (r_ratio < 1.0 ? radius_minor : r_ratio*radius_minor);
-    return (rad_max > length ? rad_max : length);
+    return (rad_max > length ? rad_max : hlength);
 }
 
@@ -35 +35 @@
 static double
 effective_radius(int mode, double radius_minor, double r_ratio, double length)
+//effective_radius_type = ["equivalent sphere","average radius","min radius","max radius",
+//                         "equivalent circular cross-section","half length","half min dimension","half max dimension","half diagonal"]
 {
     if (mode == 1) {
@@ -49 +51 @@
         return 0.5*length;
     } else if (mode == 7) {
-        return radius_from_min_dimension(radius_minor,r_ratio,length);
+        return radius_from_min_dimension(radius_minor,r_ratio,0.5*length);
     } else if (mode == 8) {
-        return radius_from_max_dimension(radius_minor,r_ratio,length);
+        return radius_from_max_dimension(radius_minor,r_ratio,0.5*length);
     } else {
         return radius_from_diagonal(radius_minor,r_ratio,length);