Changeset 6794301 in sasmodels


Ignore:
Timestamp:
Mar 20, 2016 10:23:05 AM (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, 9da407c
Parents:
8b935d1
Message:

NR gamma function replaced

Location:
sasmodels/models
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/fractal_core_shell.c

    r7d4b2ae r6794301  
    4747    double qr = q*radius; 
    4848 
    49     double t1 = frac_dim*exp(lanczos_gamma(frac_1))*sin(frac_1*atan(q*cor_length)); 
     49    double t1 = frac_dim*sas_gamma(frac_1)*sin(frac_1*atan(q*cor_length)); 
    5050    double t2 = (1.0 + 1.0/(q*cor_length)/(q*cor_length)); 
    5151    double t3 = pow(qr, frac_dim) * pow(t2, (frac_1/2.0)); 

  • sasmodels/models/fractal_core_shell.py

    raa2edb2 r6794301  
    7373# pylint: enable=bad-whitespace, line-too-long 
    7474 
    75 source = ["lib/sph_j1c.c", "lib/lanczos_gamma.c", "lib/core_shell.c", "fractal_core_shell.c"] 
     75source = ["lib/sph_j1c.c", "lib/sas_gamma.c", "lib/core_shell.c", "fractal_core_shell.c"] 
    7676 
    7777demo = dict(scale=0.05, 

  • sasmodels/models/mass_fractal.c

    r61fd21d r6794301  
    2828    //calculate S(q) 
    2929    double mmo = mass_dim-1.0; 
    30     double sq = exp(lanczos_gamma(mmo))*sin((mmo)*atan(q*cutoff_length)); 
     30    double sq = sas_gamma(mmo)*sin((mmo)*atan(q*cutoff_length)); 
    3131    sq *= pow(cutoff_length, mmo); 
    3232    sq /= pow((1.0 + (q*cutoff_length)*(q*cutoff_length)),(mmo/2.0)); 

  • sasmodels/models/mass_fractal.py

    raa2edb2 r6794301  
    8585# pylint: enable=bad-whitespace, line-too-long 
    8686 
    87 source = ["lib/sph_j1c.c", "lib/lanczos_gamma.c", "mass_fractal.c"] 
     87source = ["lib/sph_j1c.c", "lib/sas_gamma.c", "mass_fractal.c"] 
    8888 
    8989demo = dict(scale=1, background=0, 

  • sasmodels/models/surface_fractal.c

    r9c461c7 r6794301  
    2626    //calculate S(q) 
    2727    mmo = 5.0 - surface_dim; 
    28     sq  = exp(lanczos_gamma(mmo))*sin(-(mmo)*atan(q*cutoff_length)); 
     28    sq  = sas_gamma(mmo)*sin(-(mmo)*atan(q*cutoff_length)); 
    2929    sq *= pow(cutoff_length, mmo); 
    3030    sq /= pow((1.0 + (q*cutoff_length)*(q*cutoff_length)),(mmo/2.0)); 

  • sasmodels/models/surface_fractal.py

    raa2edb2 r6794301  
    8787# pylint: enable=bad-whitespace, line-too-long 
    8888 
    89 source = ["lib/sph_j1c.c", "lib/lanczos_gamma.c", "surface_fractal.c"] 
     89source = ["lib/sph_j1c.c", "lib/sas_gamma.c", "surface_fractal.c"] 
    9090 
    9191demo = dict(scale=1, background=0, 
Note: See TracChangeset for help on using the changeset viewer.