Changeset 4b541ac in sasmodels


Ignore:
Timestamp:
Jan 11, 2017 9:01:30 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:
391aba4
Parents:
592343f
Message:

sas_Si fixes in py files

Location:
sasmodels/models
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/core_shell_bicelle.py

    rfcb33e4 r4b541ac  
    141141# pylint: enable=bad-whitespace, line-too-long 
    142142 
    143 source = ["lib/Si.c", "lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", 
     143source = ["lib/sas_Si.c", "lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", 
    144144          "core_shell_bicelle.c"] 
    145145 
  • sasmodels/models/core_shell_bicelle_elliptical.py

    rfcb33e4 r4b541ac  
    132132# pylint: enable=bad-whitespace, line-too-long 
    133133 
    134 source = ["lib/Si.c", "lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c","core_shell_bicelle_elliptical.c"] 
     134source = ["lib/sas_Si.c", "lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", 
     135          "core_shell_bicelle_elliptical.c"] 
    135136 
    136137demo = dict(scale=1, background=0, 
  • sasmodels/models/pearl_necklace.c

    r925ad6e r4b541ac  
    3434    // But there is a 1/(1-sinc) term below which blows up so don't bother 
    3535    const double q_edge = q * edge_sep; 
    36     const double beta = (Si(q*(A_s-radius)) - Si(q*radius)) / q_edge; 
    37     const double gamma = Si(q_edge) / q_edge; 
     36    const double beta = (sas_Si(q*(A_s-radius)) - sas_Si(q*radius)) / q_edge; 
     37    const double gamma = sas_Si(q_edge) / q_edge; 
    3838    const double psi = sas_3j1x_x(q*radius); 
    3939 
  • sasmodels/models/pearl_necklace.py

    r925ad6e r4b541ac  
    9292             ] 
    9393 
    94 source = ["lib/Si.c", "lib/sas_3j1x_x.c", "pearl_necklace.c"] 
     94source = ["lib/sas_Si.c", "lib/sas_3j1x_x.c", "pearl_necklace.c"] 
    9595single = False  # use double precision unless told otherwise 
    9696 
Note: See TracChangeset for help on using the changeset viewer.