Changeset d277229 in sasmodels for sasmodels/models/capped_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/capped_cylinder.c (modified) (1 diff)

sasmodels/models/capped_cylinder.c

@@ -84 +84 @@
 }
 
+static double
+radius_from_volume(double radius, double radius_cap, double length)
+{
+    const double vol_cappedcyl = form_volume(radius,radius_cap,length);
+    return cbrt(0.75*vol_cappedcyl/M_PI);
+}
+
+static double
+radius_from_totallength(double radius, double radius_cap, double length)
+{
+    const double hc = radius_cap - sqrt(radius_cap*radius_cap - radius*radius);
+    return 0.5*length + hc;
+}
+
+static double
+effective_radius(int mode, double radius, double radius_cap, double length)
+{
+    if (mode == 1) {
+        return radius_from_volume(radius, radius_cap, length);
+    } else if (mode == 2) {
+        return radius;
+    } else if (mode == 3) {
+        return 0.5*length;
+    } else {
+        return radius_from_totallength(radius, radius_cap,length);
+    }
+}
+
 static void
 Fq(double q,double *F1, double *F2, double sld, double solvent_sld,