Changeset 9c461c7 in sasmodels for sasmodels/models/mass_fractal.c


Ignore:
Timestamp:
Jan 21, 2016 2:47:17 AM (8 years ago)
Author:
piotr
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:
790bcc4c
Parents:
9eaadb3
Message:
  1. Code review from PK: renamed J1c to sph_j1c
  2. Fixed mass_fractal
File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasmodels/models/mass_fractal.c

    r5c1d341 r9c461c7  
    1717          double cutoff_length) 
    1818{ 
    19  
    20     //calculate P(q) for the spherical subunits; not normalized 
    21     //double pq = pow((3.0*(sin(q*radius) - q*radius*cos(q*radius))/pow((q*radius),3)),2); 
    22     double pq = J1c(q*radius); 
    23  
    24     //pq = 1.0; 
     19    //calculate P(q) 
     20    double pq = sph_j1c(q*radius); 
     21    pq = pq*pq; 
    2522 
    2623    //calculate S(q) 
    … …  
    3027    sq /= pow((1.0 + (q*cutoff_length)*(q*cutoff_length)),(mmo/2.0)); 
    3128    sq /= q; 
    32  
    33     //sq = 1.0; 
    3429 
    3530    //combine and return 
Note: See TracChangeset for help on using the changeset viewer.