Changeset d277229 in sasmodels for sasmodels/models/hollow_cylinder.c

Timestamp:

Sep 7, 2018 5:29:38 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:

3c60146

Parents:

2a12351b

Message:

Models updated to include choices for effective interaction radii

File:

• sasmodels/models/hollow_cylinder.c (modified) (1 diff)

sasmodels/models/hollow_cylinder.c

@@ -22 +22 @@
 }
 
+static double
+radius_from_volume(double radius, double thickness, double length)
+{
+    const double volume_outer_cyl = M_PI*square(radius + thickness)*length;
+    return cbrt(0.75*volume_outer_cyl/M_PI);
+}
+
+static double
+radius_from_diagonal(double radius, double thickness, double length)
+{
+    return sqrt(square(radius + thickness) + 0.25*square(length));
+}
+
+static double
+effective_radius(int mode, double radius, double thickness, double length)
+{
+    if (mode == 1) {
+        return radius_from_volume(radius, thickness, length);
+    } else if (mode == 2) {
+        return radius + thickness;
+    } else if (mode == 3) {
+        return 0.5*length;
+    } else if (mode == 4) {
+        return (radius + thickness < 0.5*length ? radius + thickness : 0.5*length);
+    } else if (mode == 5) {
+        return (radius + thickness > 0.5*length ? radius + thickness : 0.5*length);
+    } else {
+        return radius_from_diagonal(radius,thickness,length);
+    }
+}
 
 static void