Changeset 504abee in sasmodels

Timestamp:

Feb 1, 2016 4:38:22 AM (8 years ago)

Author:

piotr

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

8696a87

Parents:

ed82794

Message:

converted FlexibleCylinderEx?

Location:

sasmodels/models

Files:

• flexible_cylinder_ex.c (added)
• flexible_cylinder_ex.py (added)
• img/flexible_cylinder_ex_1d.jpg (added)
• img/flexible_cylinder_ex_geometry.jpg (added)
• lib/wrc_cyl.c (modified) (2 diffs)

sasmodels/models/lib/wrc_cyl.c

@@ -297 +297 @@
 }
 
-
+static double
+Sdebye_kernel(double arg)
+{
+    // ORIGINAL
+    double result = 2.0*(exp(-arg) + arg -1.0)/(pow((arg),2));
+
+    // CONVERSION 1 from http://herbie.uwplse.org/
+    //
+    // exhibits discontinuity - needs more investigation
+    //double a1 = 1.0/6.0;
+    //double a2 = 1.0/72.0;
+    //double a3 = 1.0/24.0;
+    //double result = pow((1.0 - a1*arg - (a2+a3)*arg*arg), 2);
+
+    return result;
+}
 static double
 Sdebye(double q, double L, double b)
 {
-    return 2.0*(exp(-u_WR(q,L,b)) + u_WR(q,L,b) -1.0)/(pow((u_WR(q,L,b)),2));
+    double arg = u_WR(q,L,b);
+    return Sdebye_kernel(arg);
 }
 
@@ -308 +324 @@
 Sdebye1(double q, double L, double b)
 {
-    return 2.0*(exp(-u1(q,L,b)) + u1(q,L,b) -1.0)/( pow((u1(q,L,b)),2.0) );
+    double arg = u1(q,L,b);
+    return Sdebye_kernel(arg);
+
 }