Changeset 4367142 in sasmodels


Ignore:
Timestamp:
Dec 29, 2016 3:15:38 PM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
aa107ef
Parents:
edf1e8b
git-author:
Paul Kienzle <pkienzle@…> (12/29/16 15:15:04)
git-committer:
Paul Kienzle <pkienzle@…> (12/29/16 15:15:38)
Message:

linear_pearls: rename variable for clarity

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/linear_pearls.c

    re9b0ef3 r4367142  
    4646    double psi = sph_j1c(q * radius); 
    4747 
    48     // N pearls contribution 
    49     double n_contrib = (double)num_pearls; 
     48    // N pearls interaction terms  
     49    double structure_factor = (double)num_pearls; 
    5050    for(int num=1; num<num_pearls; num++) { 
    51         n_contrib += 2.0*(num_pearls-num)*sinc(q*separation*num); 
     51        structure_factor += 2.0*(num_pearls-num)*sinc(q*separation*num); 
    5252    } 
    5353    // form factor for num_pearls 
    54     double form_factor = 1.0e-4 * n_contrib * square(m_s*psi) / tot_vol; 
     54    double form_factor = 1.0e-4 * structure_factor * square(m_s*psi) / tot_vol; 
    5555 
    5656    return form_factor; 
Note: See TracChangeset for help on using the changeset viewer.