Changeset 99658f6 in sasmodels for sasmodels/models/cylinder.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/cylinder.c (modified) (2 diffs)

sasmodels/models/cylinder.c

@@ -11 +11 @@
 {
     return sas_2J1x_x(qab*radius) * sas_sinx_x(qc*0.5*length);
+}
+
+static double
+radius_from_excluded_volume(double radius, double length)
+{
+    return 0.5*cbrt(0.75*radius*(2.0*radius*length + (radius + length)*(M_PI*radius + length)));
 }
 
@@ -31 +37 @@
     default:
     case 1:
+        return radius_from_excluded_volume(radius, length);
+    case 2:
         return radius_from_volume(radius, length);
-    case 2:
+    case 3:
         return radius;
-    case 3:
+    case 4:
         return 0.5*length;
-    case 4:
+    case 5:
         return (radius < 0.5*length ? radius : 0.5*length);
-    case 5:
+    case 6:
         return (radius > 0.5*length ? radius : 0.5*length);
-    case 6:
+    case 7:
         return radius_from_diagonal(radius,length);
     }