Changeset 592343f in sasmodels


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

Legend:

Unmodified
Added
Removed
  • sasmodels/models/barbell.c

    r1e7b0db0 r592343f  
    3333        const double t = Gauss76Z[i]*zm + zb; 
    3434        const double radical = 1.0 - t*t; 
    35         const double bj = sas_J1c(qrst*sqrt(radical)); 
     35        const double bj = sas_2J1x_x(qrst*sqrt(radical)); 
    3636        const double Fq = cos(m*t + b) * radical * bj; 
    3737        total += Gauss76Wt[i] * Fq; 
     
    4949{ 
    5050    const double bell_fq = _bell_kernel(q, h, radius_bell, half_length, sin_alpha, cos_alpha); 
    51     const double bj = sas_J1c(q*radius*sin_alpha); 
     51    const double bj = sas_2J1x_x(q*radius*sin_alpha); 
    5252    const double si = sas_sinx_x(q*half_length*cos_alpha); 
    5353    const double cyl_fq = 2.0*M_PI*radius*radius*half_length*bj*si; 
  • sasmodels/models/capped_cylinder.c

    r1e7b0db0 r592343f  
    3939        const double t = Gauss76Z[i]*zm + zb; 
    4040        const double radical = 1.0 - t*t; 
    41         const double bj = sas_J1c(qrst*sqrt(radical)); 
     41        const double bj = sas_2J1x_x(qrst*sqrt(radical)); 
    4242        const double Fq = cos(m*t + b) * radical * bj; 
    4343        total += Gauss76Wt[i] * Fq; 
     
    5454{ 
    5555    const double cap_Fq = _cap_kernel(q, h, radius_cap, half_length, sin_alpha, cos_alpha); 
    56     const double bj = sas_J1c(q*radius*sin_alpha); 
     56    const double bj = sas_2J1x_x(q*radius*sin_alpha); 
    5757    const double si = sas_sinx_x(q*half_length*cos_alpha); 
    5858    const double cyl_Fq = 2.0*M_PI*radius*radius*half_length*bj*si; 
  • sasmodels/models/core_shell_bicelle.c

    r1e7b0db0 r592343f  
    5555    double sinarg2 = qq*(length+facthick)*cos_alpha; 
    5656 
    57     be1 = sas_J1c(besarg1); 
    58     be2 = sas_J1c(besarg2); 
     57    be1 = sas_2J1x_x(besarg1); 
     58    be2 = sas_2J1x_x(besarg2); 
    5959    si1 = sas_sinx_x(sinarg1); 
    6060    si2 = sas_sinx_x(sinarg2); 
  • sasmodels/models/core_shell_bicelle_elliptical.c

    r1e7b0db0 r592343f  
    8585            double besarg1 = qq*rr*sin_alpha; 
    8686            double besarg2 = qq*(rr+radthick)*sin_alpha; 
    87             be1 = sas_J1c(besarg1); 
    88             be2 = sas_J1c(besarg2); 
     87            be1 = sas_2J1x_x(besarg1); 
     88            be2 = sas_2J1x_x(besarg2); 
    8989            inner_sum += Gauss76Wt[j] *square(dr1*si1*be1 + 
    9090                                              dr2*si2*be2 + 
     
    129129    // ASSUME the sin_alpha is included in the separate integration over orientation of rod angle 
    130130    const double r = rad*sqrt(square(x_core*cos_nu) + cos_mu*cos_mu); 
    131     const double be1 = sas_J1c(qq*r); 
    132     const double be2 = sas_J1c( qq*(r + radthick ) ); 
     131    const double be1 = sas_2J1x_x( qq*r ); 
     132    const double be2 = sas_2J1x_x( qq*(r + radthick ) ); 
    133133    const double si1 = sas_sinx_x( qq*halfheight*cos_val ); 
    134134    const double si2 = sas_sinx_x( qq*(halfheight + facthick)*cos_val ); 
  • sasmodels/models/core_shell_cylinder.c

    r1e7b0db0 r592343f  
    1111double _cyl(double vd, double besarg, double siarg) 
    1212{ 
    13     return vd * sas_sinx_x(siarg) * sas_J1c(besarg); 
     13    return vd * sas_sinx_x(siarg) * sas_2J1x_x(besarg); 
    1414} 
    1515 
  • sasmodels/models/cylinder.c

    r1e7b0db0 r592343f  
    1818    const double qr = q*radius; 
    1919    const double qh = q*0.5*length;  
    20     return sas_J1c(qr*sn) * sas_sinx_x(qh*cn); 
     20    return sas_2J1x_x(qr*sn) * sas_sinx_x(qh*cn); 
    2121} 
    2222 
  • sasmodels/models/elliptical_cylinder.c

    r1e7b0db0 r592343f  
    3939            const double theta = ( Gauss20Z[j]*(vbj-vaj) + vaj + vbj )/2.0; 
    4040            const double r = sin_val*sqrt(rA - rB*cos(theta)); 
    41             const double be = sas_J1c(q*r); 
     41            const double be = sas_2J1x_x(q*r); 
    4242            inner_sum += Gauss20Wt[j] * be * be; 
    4343        } 
     
    7373    // Given:    radius_major = r_ratio * radius_minor 
    7474    const double r = radius_minor*sqrt(square(r_ratio*cos_nu) + cos_mu*cos_mu); 
    75     const double be = sas_J1c(q*r); 
     75    const double be = sas_2J1x_x(q*r); 
    7676    const double si = sas_sinx_x(q*0.5*length*cos_val); 
    7777    const double Aq = be * si; 
  • sasmodels/models/flexible_cylinder.c

    r4937980 r592343f  
    1414{ 
    1515    const double contrast = sld - solvent_sld; 
    16     const double cross_section = sas_J1c(q*radius); 
     16    const double cross_section = sas_2J1x_x(q*radius); 
    1717    const double volume = M_PI*radius*radius*length; 
    1818    const double flex = Sk_WR(q, length, kuhn_length); 
  • sasmodels/models/flexible_cylinder_elliptical.c

    r92ce163 r592343f  
    2222        SINCOS(zi, sn, cn); 
    2323        const double arg = q*sqrt(a*a*sn*sn + b*b*cn*cn); 
    24         const double yyy = sas_J1c(arg); 
     24        const double yyy = sas_2J1x_x(arg); 
    2525        sum += Gauss76Wt[i] * yyy * yyy; 
    2626    } 
  • sasmodels/models/hollow_cylinder.c

    r1e7b0db0 r592343f  
    2020{ 
    2121    const double qs = q*sin_val; 
    22     const double lam1 = sas_J1c((radius+thickness)*qs); 
    23     const double lam2 = sas_J1c(radius*qs); 
     22    const double lam1 = sas_2J1x_x((radius+thickness)*qs); 
     23    const double lam2 = sas_2J1x_x(radius*qs); 
    2424    const double gamma_sq = square(radius/(radius+thickness)); 
    25     //Note: lim_{thickness -> 0} psi = J0(radius*qs) 
    26     //Note: lim_{radius -> 0} psi = sas_J1c(thickness*qs) 
     25    //Note: lim_{thickness -> 0} psi = sas_J0(radius*qs) 
     26    //Note: lim_{radius -> 0} psi = sas_2J1x_x(thickness*qs) 
    2727    const double psi = (lam1 - gamma_sq*lam2)/(1.0 - gamma_sq); //SRK 10/19/00 
    2828    const double t2 = sas_sinx_x(0.5*q*length*cos_val); 
  • sasmodels/models/stacked_disks.c

    r1e7b0db0 r592343f  
    5353    const double sinarg2 = q*(halfheight+thick_layer)*cos_alpha; 
    5454 
    55     const double be1 = sas_J1c(besarg1); 
     55    const double be1 = sas_2J1x_x(besarg1); 
    5656    //const double be2 = sas_J1c(besarg2); 
    5757    const double be2 = be1; 
Note: See TracChangeset for help on using the changeset viewer.