Changeset 26141cb in sasmodels


Ignore:
Timestamp:
Mar 19, 2016 4:47:45 PM (9 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

Location:
sasmodels/models
Files:
3 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/barbell.c

    r50e1e40 r26141cb  
    3131        const double t = Gauss76Z[i]*zm + zb; 
    3232        const double radical = 1.0 - t*t; 
    33         const double bj = J1c(qrst*sqrt(radical)); 
     33        const double bj = sas_J1c(qrst*sqrt(radical)); 
    3434        const double Fq = cos(m*t + b) * radical * bj; 
    3535        total += Gauss76Wt[i] * Fq; 
    … …  
    7373 
    7474        const double bell_Fq = _bell_kernel(q, h, bell_radius, half_length, sin_alpha, cos_alpha); 
    75         const double bj = J1c(q*radius*sin_alpha); 
     75        const double bj = sas_J1c(q*radius*sin_alpha); 
    7676        const double si = sinc(q*half_length*cos_alpha); 
    7777        const double cyl_Fq = M_PI*radius*radius*length*bj*si; 
    … …  
    108108    SINCOS(alpha, sin_alpha, cos_alpha); 
    109109    const double bell_Fq = _bell_kernel(q, h, bell_radius, half_length, sin_alpha, cos_alpha); 
    110     const double bj = J1c(q*radius*sin_alpha); 
     110    const double bj = sas_J1c(q*radius*sin_alpha); 
    111111    const double si = sinc(q*half_length*cos_alpha); 
    112112    const double cyl_Fq = M_PI*radius*radius*length*bj*si; 

  • sasmodels/models/barbell.py

    r2f0c07d r26141cb  
    111111# pylint: enable=bad-whitespace, line-too-long 
    112112 
    113 source = ["lib/J1c.c", "lib/gauss76.c", "barbell.c"] 
     113source = ["lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", "barbell.c"] 
    114114 
    115115# parameters for demo 

  • sasmodels/models/capped_cylinder.c

    r50e1e40 r26141cb  
    3737        const double t = Gauss76Z[i]*zm + zb; 
    3838        const double radical = 1.0 - t*t; 
    39         const double bj = J1c(qrst*sqrt(radical)); 
     39        const double bj = sas_J1c(qrst*sqrt(radical)); 
    4040        const double Fq = cos(m*t + b) * radical * bj; 
    4141        total += Gauss76Wt[i] * Fq; 
    … …  
    9494 
    9595        const double cap_Fq = _cap_kernel(q, h, cap_radius, half_length, sin_alpha, cos_alpha); 
    96         const double bj = J1c(q*radius*sin_alpha); 
     96        const double bj = sas_J1c(q*radius*sin_alpha); 
    9797        const double si = sinc(q*half_length*cos_alpha); 
    9898        const double cyl_Fq = M_PI*radius*radius*length*bj*si; 
    … …  
    129129    SINCOS(alpha, sin_alpha, cos_alpha); 
    130130    const double cap_Fq = _cap_kernel(q, h, cap_radius, half_length, sin_alpha, cos_alpha); 
    131     const double bj = J1c(q*radius*sin_alpha); 
     131    const double bj = sas_J1c(q*radius*sin_alpha); 
    132132    const double si = sinc(q*half_length*cos_alpha); 
    133133    const double cyl_Fq = M_PI*radius*radius*length*bj*si; 

  • sasmodels/models/capped_cylinder.py

    r2f0c07d r26141cb  
    129129# pylint: enable=bad-whitespace, line-too-long 
    130130 
    131 source = ["lib/J1c.c", "lib/gauss76.c", "capped_cylinder.c"] 
     131source = ["lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", "capped_cylinder.c"] 
    132132 
    133133demo = dict(scale=1, background=0, 

  • sasmodels/models/cylinder.c

    r50e1e40 r26141cb  
    2929        double sn, cn; 
    3030        SINCOS(alpha, sn, cn); 
    31         const double fq = sinc(qh*cn) * J1c(qr*sn); 
     31        const double fq = sinc(qh*cn) * sas_J1c(qr*sn); 
    3232        total += Gauss76Wt[i] * fq*fq * sn; 
    3333    } 
    … …  
    5757 
    5858    SINCOS(alpha, sn, cn); 
    59     const double fq = sinc(q*0.5*length*cn) * J1c(q*radius*sn); 
     59    const double fq = sinc(q*0.5*length*cn) * sas_J1c(q*radius*sn); 
    6060    const double s = (sld-solvent_sld) * form_volume(radius, length); 
    6161    return 1.0e-4 * square(s * fq); 

  • sasmodels/models/cylinder.py

    r01eece6 r26141cb  
    119119             ] 
    120120 
    121 source = ["lib/J1c.c", "lib/gauss76.c", "cylinder.c"] 
     121source = ["lib/polevl.c","lib/sas_J1.c", "lib/gauss76.c", "cylinder.c"] 
    122122 
    123123def ER(radius, length): 

  • sasmodels/models/flexible_cylinder.py

    r43b7eea r26141cb  
    8484    ] 
    8585# pylint: enable=bad-whitespace, line-too-long 
    86 source = ["lib/polevl.c","lib/sas_J1c.c", "lib/wrc_cyl.c", "flexible_cylinder.c"] 
     86source = ["lib/polevl.c", "lib/sas_J1.c", "lib/wrc_cyl.c", "flexible_cylinder.c"] 
    8787 
    8888demo = dict(scale=1.0, background=0.0001, 
Note: See TracChangeset for help on using the changeset viewer.