Changes in / [8696a87:5c962df] in sasmodels

Location:

sasmodels/models

Files:

• flexible_cylinder_ex.c (deleted)
• flexible_cylinder_ex.py (deleted)
• img/flexible_cylinder_ex_1d.jpg (deleted)
• img/flexible_cylinder_ex_geometry.jpg (deleted)
• 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)
 {
-    double arg = u_WR(q,L,b);
-    return Sdebye_kernel(arg);
+    return 2.0*(exp(-u_WR(q,L,b)) + u_WR(q,L,b) -1.0)/(pow((u_WR(q,L,b)),2));
 }
 
@@ -324 +308 @@
 Sdebye1(double q, double L, double b)
 {
-    double arg = u1(q,L,b);
-    return Sdebye_kernel(arg);
-
+    return 2.0*(exp(-u1(q,L,b)) + u1(q,L,b) -1.0)/( pow((u1(q,L,b)),2.0) );
 }