Ignore:
Timestamp:
Oct 1, 2016 12:53:30 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:
5b60eeb
Parents:
7c57861
Message:

Last of parameter normalization. Fixes #649

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/mass_surface_fractal.c

    ra807206 r30fbe2e  
    55          double fractal_dim_surf, 
    66          double rg_cluster, 
    7           double primary_rg); 
     7          double rg_primary); 
    88 
    99static double _mass_surface_fractal_kernel(double q, 
    … …  
    1111          double fractal_dim_surf, 
    1212          double rg_cluster, 
    13           double primary_rg) 
     13          double rg_primary) 
    1414{ 
    1515     //computation 
    … …  
    1919 
    2020    double rc_norm = rg_cluster * rg_cluster / (3.0 * fractal_dim_mass); 
    21     double rp_norm = primary_rg * primary_rg / (3.0 * tot_dim); 
     21    double rp_norm = rg_primary * rg_primary / (3.0 * tot_dim); 
    2222 
    2323    //x for P 
    … …  
    4444          double fractal_dim_surf, 
    4545          double rg_cluster, 
    46           double primary_rg) 
     46          double rg_primary) 
    4747{ 
    4848    return _mass_surface_fractal_kernel(q, 
    … …  
    5050            fractal_dim_surf, 
    5151            rg_cluster, 
    52             primary_rg); 
     52            rg_primary); 
    5353} 
Note: See TracChangeset for help on using the changeset viewer.