Changeset 26141cb in sasmodels for sasmodels/models/barbell.c

Timestamp:

Mar 19, 2016 4:47:45 PM (8 years ago)

Author:

wojciech

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c

Parents:

43b7eea

Message:

A few extra models fixed

File:

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

sasmodels/models/barbell.c

@@ -31 +31 @@
         const double t = Gauss76Z[i]*zm + zb;
         const double radical = 1.0 - t*t;
-        const double bj = J1c(qrst*sqrt(radical));
+        const double bj = sas_J1c(qrst*sqrt(radical));
         const double Fq = cos(m*t + b) * radical * bj;
         total += Gauss76Wt[i] * Fq;
@@ -73 +73 @@
 
         const double bell_Fq = _bell_kernel(q, h, bell_radius, half_length, sin_alpha, cos_alpha);
-        const double bj = J1c(q*radius*sin_alpha);
+        const double bj = sas_J1c(q*radius*sin_alpha);
         const double si = sinc(q*half_length*cos_alpha);
         const double cyl_Fq = M_PI*radius*radius*length*bj*si;
@@ -108 +108 @@
     SINCOS(alpha, sin_alpha, cos_alpha);
     const double bell_Fq = _bell_kernel(q, h, bell_radius, half_length, sin_alpha, cos_alpha);
-    const double bj = J1c(q*radius*sin_alpha);
+    const double bj = sas_J1c(q*radius*sin_alpha);
     const double si = sinc(q*half_length*cos_alpha);
     const double cyl_Fq = M_PI*radius*radius*length*bj*si;