Changes in sasmodels/models/elliptical_cylinder.c [d277229:fbaef04] in sasmodels
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/elliptical_cylinder.c
rd277229 rfbaef04 13 13 14 14 static double 15 radius_from_min_dimension(double radius_minor, double r_ratio, double length)15 radius_from_min_dimension(double radius_minor, double r_ratio, double hlength) 16 16 { 17 17 const double rad_min = (r_ratio > 1.0 ? radius_minor : r_ratio*radius_minor); 18 return (rad_min < length ? rad_min :length);18 return (rad_min < hlength ? rad_min : hlength); 19 19 } 20 20 21 21 static double 22 radius_from_max_dimension(double radius_minor, double r_ratio, double length)22 radius_from_max_dimension(double radius_minor, double r_ratio, double hlength) 23 23 { 24 24 const double rad_max = (r_ratio < 1.0 ? radius_minor : r_ratio*radius_minor); 25 return (rad_max > length ? rad_max :length);25 return (rad_max > hlength ? rad_max : hlength); 26 26 } 27 27 … … 35 35 static double 36 36 effective_radius(int mode, double radius_minor, double r_ratio, double length) 37 //effective_radius_type = ["equivalent sphere","average radius","min radius","max radius", 38 // "equivalent circular cross-section","half length","half min dimension","half max dimension","half diagonal"] 37 39 { 38 40 if (mode == 1) { … … 49 51 return 0.5*length; 50 52 } else if (mode == 7) { 51 return radius_from_min_dimension(radius_minor,r_ratio, length);53 return radius_from_min_dimension(radius_minor,r_ratio,0.5*length); 52 54 } else if (mode == 8) { 53 return radius_from_max_dimension(radius_minor,r_ratio, length);55 return radius_from_max_dimension(radius_minor,r_ratio,0.5*length); 54 56 } else { 55 57 return radius_from_diagonal(radius_minor,r_ratio,length);
Note: See TracChangeset
for help on using the changeset viewer.