Changeset 592343f in sasmodels

Timestamp:

Jan 11, 2017 8:36:37 AM (8 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

Location:

sasmodels/models

Files:

• barbell.c (modified) (2 diffs)
• capped_cylinder.c (modified) (2 diffs)
• core_shell_bicelle.c (modified) (1 diff)
• core_shell_bicelle_elliptical.c (modified) (2 diffs)
• core_shell_cylinder.c (modified) (1 diff)
• cylinder.c (modified) (1 diff)
• elliptical_cylinder.c (modified) (2 diffs)
• flexible_cylinder.c (modified) (1 diff)
• flexible_cylinder_elliptical.c (modified) (1 diff)
• hollow_cylinder.c (modified) (1 diff)
• stacked_disks.c (modified) (1 diff)

sasmodels/models/barbell.c

@@ -33 +33 @@
         const double t = Gauss76Z[i]*zm + zb;
         const double radical = 1.0 - t*t;
-        const double bj = sas_J1c(qrst*sqrt(radical));
+        const double bj = sas_2J1x_x(qrst*sqrt(radical));
         const double Fq = cos(m*t + b) * radical * bj;
         total += Gauss76Wt[i] * Fq;
@@ -49 +49 @@
 {
     const double bell_fq = _bell_kernel(q, h, radius_bell, half_length, sin_alpha, cos_alpha);
-    const double bj = sas_J1c(q*radius*sin_alpha);
+    const double bj = sas_2J1x_x(q*radius*sin_alpha);
     const double si = sas_sinx_x(q*half_length*cos_alpha);
     const double cyl_fq = 2.0*M_PI*radius*radius*half_length*bj*si;

sasmodels/models/capped_cylinder.c

@@ -39 +39 @@
         const double t = Gauss76Z[i]*zm + zb;
         const double radical = 1.0 - t*t;
-        const double bj = sas_J1c(qrst*sqrt(radical));
+        const double bj = sas_2J1x_x(qrst*sqrt(radical));
         const double Fq = cos(m*t + b) * radical * bj;
         total += Gauss76Wt[i] * Fq;
@@ -54 +54 @@
 {
     const double cap_Fq = _cap_kernel(q, h, radius_cap, half_length, sin_alpha, cos_alpha);
-    const double bj = sas_J1c(q*radius*sin_alpha);
+    const double bj = sas_2J1x_x(q*radius*sin_alpha);
     const double si = sas_sinx_x(q*half_length*cos_alpha);
     const double cyl_Fq = 2.0*M_PI*radius*radius*half_length*bj*si;

sasmodels/models/core_shell_bicelle.c

@@ -55 +55 @@
     double sinarg2 = qq*(length+facthick)*cos_alpha;
 
-    be1 = sas_J1c(besarg1);
-    be2 = sas_J1c(besarg2);
+    be1 = sas_2J1x_x(besarg1);
+    be2 = sas_2J1x_x(besarg2);
     si1 = sas_sinx_x(sinarg1);
     si2 = sas_sinx_x(sinarg2);

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 );

sasmodels/models/core_shell_cylinder.c

@@ -11 +11 @@
 double _cyl(double vd, double besarg, double siarg)
 {
-    return vd * sas_sinx_x(siarg) * sas_J1c(besarg);
+    return vd * sas_sinx_x(siarg) * sas_2J1x_x(besarg);
 }
 

sasmodels/models/cylinder.c

@@ -18 +18 @@
     const double qr = q*radius;
     const double qh = q*0.5*length; 
-    return sas_J1c(qr*sn) * sas_sinx_x(qh*cn);
+    return sas_2J1x_x(qr*sn) * sas_sinx_x(qh*cn);
 }
 

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;
         }
@@ -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 be = sas_2J1x_x(q*r);
     const double si = sas_sinx_x(q*0.5*length*cos_val);
     const double Aq = be * si;

sasmodels/models/flexible_cylinder.c

@@ -14 +14 @@
 {
     const double contrast = sld - solvent_sld;
-    const double cross_section = sas_J1c(q*radius);
+    const double cross_section = sas_2J1x_x(q*radius);
     const double volume = M_PI*radius*radius*length;
     const double flex = Sk_WR(q, length, kuhn_length);

sasmodels/models/flexible_cylinder_elliptical.c

@@ -22 +22 @@
         SINCOS(zi, sn, cn);
         const double arg = q*sqrt(a*a*sn*sn + b*b*cn*cn);
-        const double yyy = sas_J1c(arg);
+        const double yyy = sas_2J1x_x(arg);
         sum += Gauss76Wt[i] * yyy * yyy;
     }

sasmodels/models/hollow_cylinder.c

@@ -20 +20 @@
 {
     const double qs = q*sin_val;
-    const double lam1 = sas_J1c((radius+thickness)*qs);
-    const double lam2 = sas_J1c(radius*qs);
+    const double lam1 = sas_2J1x_x((radius+thickness)*qs);
+    const double lam2 = sas_2J1x_x(radius*qs);
     const double gamma_sq = square(radius/(radius+thickness));
-    //Note: lim_{thickness -> 0} psi = J0(radius*qs)
-    //Note: lim_{radius -> 0} psi = sas_J1c(thickness*qs)
+    //Note: lim_{thickness -> 0} psi = sas_J0(radius*qs)
+    //Note: lim_{radius -> 0} psi = sas_2J1x_x(thickness*qs)
     const double psi = (lam1 - gamma_sq*lam2)/(1.0 - gamma_sq); //SRK 10/19/00
     const double t2 = sas_sinx_x(0.5*q*length*cos_val);

sasmodels/models/stacked_disks.c

@@ -53 +53 @@
     const double sinarg2 = q*(halfheight+thick_layer)*cos_alpha;
 
-    const double be1 = sas_J1c(besarg1);
+    const double be1 = sas_2J1x_x(besarg1);
     //const double be2 = sas_J1c(besarg2);
     const double be2 = be1;