Changes in sasmodels/models/elliptical_cylinder.c [251f54b:592343f] in sasmodels

File:

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

sasmodels/models/elliptical_cylinder.c

@@ -39 +39 @@
             const double theta = ( Gauss20Z[j]*(vbj-vaj) + vaj + vbj )/2.0;
             const double r = sin_val*sqrt(rA - rB*cos(theta));
-            const double be = sas_J1c(q*r);
+            const double be = sas_2J1x_x(q*r);
             inner_sum += Gauss20Wt[j] * be * be;
         }
@@ -46 +46 @@
 
         //now calculate outer integral
-        const double si = sinc(q*0.5*length*cos_val);
+        const double si = sas_sinx_x(q*0.5*length*cos_val);
         outer_sum += Gauss76Wt[i] * inner_sum * si * si;
     }
@@ -73 +73 @@
     // Given:    radius_major = r_ratio * radius_minor
     const double r = radius_minor*sqrt(square(r_ratio*cos_nu) + cos_mu*cos_mu);
-    const double be = sas_J1c(q*r);
-    const double si = sinc(q*0.5*length*cos_val);
+    const double be = sas_2J1x_x(q*r);
+    const double si = sas_sinx_x(q*0.5*length*cos_val);
     const double Aq = be * si;
     const double delrho = sld - solvent_sld;