Changeset 4367142 in sasmodels

Timestamp:

Dec 29, 2016 3:15:38 PM (8 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:

• sasmodels/models/linear_pearls.c (modified) (1 diff)

sasmodels/models/linear_pearls.c

@@ -46 +46 @@
     double psi = sph_j1c(q * radius);
 
-    // N pearls contribution
-    double n_contrib = (double)num_pearls;
+    // N pearls interaction terms 
+    double structure_factor = (double)num_pearls;
     for(int num=1; num<num_pearls; num++) {
-        n_contrib += 2.0*(num_pearls-num)*sinc(q*separation*num);
+        structure_factor += 2.0*(num_pearls-num)*sinc(q*separation*num);
     }
     // form factor for num_pearls
-    double form_factor = 1.0e-4 * n_contrib * square(m_s*psi) / tot_vol;
+    double form_factor = 1.0e-4 * structure_factor * square(m_s*psi) / tot_vol;
 
     return form_factor;