Changeset 92ce163 in sasmodels

Timestamp:

Oct 17, 2016 11:49:41 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

73e08ae

Parents:

9aa4881

Message:

fix error introduced with conversion to Horner's method; code cleanup

Location:

sasmodels/models

Files:

• flexible_cylinder_elliptical.c (modified) (1 diff)
• lib/wrc_cyl.c (modified) (1 diff)

sasmodels/models/flexible_cylinder_elliptical.c

@@ -15 +15 @@
 elliptical_crosssection(double q, double a, double b)
 {
-    double summ=0.0;
+    double sum=0.0;
 
     for(int i=0;i<N_POINTS_76;i++) {
-        double zi = ( Gauss76Z[i] + 1.0 )*M_PI_4;
+        const double zi = ( Gauss76Z[i] + 1.0 )*M_PI_4;
         double sn, cn;
         SINCOS(zi, sn, cn);
-        double arg = q*sqrt(a*a*sn*sn + b*b*cn*cn);
-        double yyy = sas_J1c(arg);
-        summ += Gauss76Wt[i] * yyy * yyy;
+        const double arg = q*sqrt(a*a*sn*sn + b*b*cn*cn);
+        const double yyy = sas_J1c(arg);
+        sum += Gauss76Wt[i] * yyy * yyy;
     }
-
-    summ /= 2.0;
-    return(summ);
+    sum *= 0.5;
+    return(sum);
 
 }

sasmodels/models/lib/wrc_cyl.c

@@ -22 +22 @@
 {
     const double r = b/L;
-    return (L*b/6.0) * (1.0 - r*(1.5 + r*(1.5 + r*0.75*expm1(-2.0/r))));
+    return (L*b/6.0) * (1.0 + r*(-1.5 + r*(1.5 + r*0.75*expm1(-2.0/r))));
+
 }