Changeset ee60aa7 in sasmodels for sasmodels/models/core_multi_shell.c

Timestamp:

Sep 10, 2018 2:16:46 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

d299327

Parents:

3f818b2

Message:

clean up effective radius functions; improve mono_gauss_coil accuracy; start moving VR into C

File:

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

sasmodels/models/core_multi_shell.c

@@ -6 +6 @@
   const double vol = M_4PI_3 * cube(r);
   return sld * vol * bes;
-}
-
-static double
-form_volume(double core_radius, double fp_n, double thickness[])
-{
-  double r = core_radius;
-  int n = (int)(fp_n+0.5);
-  for (int i=0; i < n; i++) {
-    r += thickness[i];
-  }
-  return M_4PI_3 * cube(r);
 }
 
@@ -31 +20 @@
 
 static double
+form_volume(double core_radius, double fp_n, double thickness[])
+{
+  return M_4PI_3 * cube(outer_radius(core_radius, fp_n, thickness));
+}
+
+static double
 effective_radius(int mode, double core_radius, double fp_n, double thickness[])
-// this seems regardless to always give the result for outer radius for n=1 shells; why??
-// printf shows fp_n is always 1, not 0,1,2
 {
-//        printf("fp_n =%g \n",fp_n);
-        if (mode == 1) {
-        double r = core_radius;
-        int n = (int)(fp_n+0.5);
-        if ( n > 0) {
-            for (int i=0; i < n; i++) {
-                r += thickness[i];
-            }
-        }
-        return r;
-        //return outer_radius(core_radius,fp_n,thickness);
-    } else {
-        return core_radius;
-    }
+  switch (mode) {
+  case 1: // outer radius
+    return outer_radius(core_radius, fp_n, thickness);
+  case 2: // core radius
+    return core_radius;
+  }
 }