Changeset a807206 in sasmodels for sasmodels/models/fractal_core_shell.c


Ignore:
Timestamp:
Sep 30, 2016 10:42:06 PM (8 years ago)
Author:
butler
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:
caddb14, 5031ca3
Parents:
2222134
Message:

updating more parameter names addressing #649

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/fractal_core_shell.c

    r2c74c11 ra807206  
    88          double solvent_sld, 
    99          double volfraction, 
    10           double frac_dim, 
     10          double fractal_dim, 
    1111          double cor_length); 
    1212 
    … …  
    2323          double solvent_sld, 
    2424          double volfraction, 
    25           double frac_dim, 
     25          double fractal_dim, 
    2626          double cor_length) { 
    2727 
    … …  
    3434                              solvent_sld); 
    3535    //calculate S(q) 
    36     double frac_1 = frac_dim-1.0; 
     36    double frac_1 = fractal_dim-1.0; 
    3737    double qr = q*radius; 
    3838 
    39     double t1 = frac_dim*sas_gamma(frac_1)*sin(frac_1*atan(q*cor_length)); 
     39    double t1 = fractal_dim*sas_gamma(frac_1)*sin(frac_1*atan(q*cor_length)); 
    4040    double t2 = (1.0 + 1.0/(q*cor_length)/(q*cor_length)); 
    41     double t3 = pow(qr, frac_dim) * pow(t2, (frac_1/2.0)); 
     41    double t3 = pow(qr, fractal_dim) * pow(t2, (frac_1/2.0)); 
    4242    double sq = t1/t3; 
    4343    sq += 1.0; 
Note: See TracChangeset for help on using the changeset viewer.