Changeset 99658f6 in sasmodels for sasmodels/models/pearl_necklace.c

Timestamp:

Nov 6, 2018 2:10:43 PM (5 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:

cf3d0ce

Parents:

5024a56

Message:

updated ER functions including cylinder excluded volume, to match 4.x

File:

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

sasmodels/models/pearl_necklace.c

@@ -67 +67 @@
 }
 
-double form_volume(double radius, double edge_sep,
-    double thick_string, double fp_num_pearls)
+double form_volume(double radius, double edge_sep, double thick_string, double fp_num_pearls)
 {
     const int num_pearls = (int)(fp_num_pearls + 0.5); //Force integer number of pearls
@@ -77 +76 @@
 
     return volume;
+}
+
+static double
+radius_from_volume(double radius, double edge_sep, double thick_string, double fp_num_pearls)
+{
+    const int num_pearls = (int) fp_num_pearls +0.5;
+    const double vol_tot = form_volume(radius, edge_sep, thick_string, fp_num_pearls);
+    return cbrt(vol_tot/M_4PI_3);
+}
+
+static double
+effective_radius(int mode, double radius, double edge_sep, double thick_string, double fp_num_pearls)
+{
+    switch (mode) {
+    default:
+    case 1:
+        return radius_from_volume(radius, edge_sep, thick_string, fp_num_pearls);
+    }
 }