Changes in sasmodels/models/raspberry.c [71b751d:d277229] in sasmodels

File:

• sasmodels/models/raspberry.c (modified) (3 diffs)

sasmodels/models/raspberry.c

@@ -1 @@
-double form_volume(double radius_lg);
+double form_volume(double radius_lg, double radius_sm, double penetration);
 
 double Iq(double q,
@@ -6 +6 @@
           double radius_lg, double radius_sm, double penetration);
 
-double form_volume(double radius_lg)
+double form_volume(double radius_lg, double radius_sm, double penetration)
 {
     //Because of the complex structure, volume normalization must
@@ -12 +12 @@
     double volume=1.0;
     return volume;
+}
+
+static double
+effective_radius(int mode, double radius_lg, double radius_sm, double penetration)
+{
+    if (mode == 1) {
+        return radius_lg;
+    } else {
+        return radius_lg + 2.0*radius_sm - penetration;
+    }
 }