Changeset 1e7b0db0 in sasmodels for sasmodels/models/core_shell_bicelle_elliptical.c

Timestamp:

Jan 11, 2017 5:57:04 AM (7 years ago)

Author:

wojciech

Branches:

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

Children:

925ad6e

Parents:

473a9f1

Message:

sinc tranfered to sas_sinx_x

File:

• sasmodels/models/core_shell_bicelle_elliptical.c (modified) (2 diffs)

sasmodels/models/core_shell_bicelle_elliptical.c

@@ -76 +76 @@
         double sinarg1 = qq*halfheight*cos_alpha;
         double sinarg2 = qq*(halfheight+facthick)*cos_alpha;
-        si1 = sinc(sinarg1);
-        si2 = sinc(sinarg2);
+        si1 = sas_sinx_x(sinarg1);
+        si2 = sas_sinx_x(sinarg2);
         for(int j=0;j<76;j++) {
             //76 gauss points for the inner integral (WAS 20 points,so this may make unecessarily slow, but playing safe)
@@ -131 +131 @@
     const double be1 = sas_J1c(qq*r);
     const double be2 = sas_J1c( qq*(r + radthick ) );
-    const double si1 = sinc( qq*halfheight*cos_val );
-    const double si2 = sinc( qq*(halfheight + facthick)*cos_val );
+    const double si1 = sas_sinx_x( qq*halfheight*cos_val );
+    const double si2 = sas_sinx_x( qq*(halfheight + facthick)*cos_val );
     const double Aq = square( vol1*dr1*si1*be1 + vol2*dr2*si2*be2 +  vol3*dr3*si2*be1);
     //const double vol = form_volume(radius_minor, r_ratio, length);