Changeset 592343f in sasmodels for sasmodels/models/core_shell_bicelle_elliptical.c

Timestamp:

Jan 11, 2017 6:36:37 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:

4b541ac

Parents:

925ad6e

Message:

sas_J1c translated to sas_2J1x_x

File:

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

sasmodels/models/core_shell_bicelle_elliptical.c

@@ -85 +85 @@
             double besarg1 = qq*rr*sin_alpha;
             double besarg2 = qq*(rr+radthick)*sin_alpha;
-            be1 = sas_J1c(besarg1);
-            be2 = sas_J1c(besarg2);
+            be1 = sas_2J1x_x(besarg1);
+            be2 = sas_2J1x_x(besarg2);
             inner_sum += Gauss76Wt[j] *square(dr1*si1*be1 +
                                               dr2*si2*be2 +
@@ -129 +129 @@
     // ASSUME the sin_alpha is included in the separate integration over orientation of rod angle
     const double r = rad*sqrt(square(x_core*cos_nu) + cos_mu*cos_mu);
-    const double be1 = sas_J1c(qq*r);
-    const double be2 = sas_J1c( qq*(r + radthick ) );
+    const double be1 = sas_2J1x_x( qq*r );
+    const double be2 = sas_2J1x_x( qq*(r + radthick ) );
     const double si1 = sas_sinx_x( qq*halfheight*cos_val );
     const double si2 = sas_sinx_x( qq*(halfheight + facthick)*cos_val );