Changeset c3ebc71 in sasmodels for sasmodels/models/polymer_micelle.c

Timestamp:

Oct 18, 2016 7:09:23 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:

3e8ea5d

Parents:

ed23abe

Message:

polymer_micelle: minor code cleanup

File:

• sasmodels/models/polymer_micelle.c (modified) (2 diffs)

sasmodels/models/polymer_micelle.c

@@ -32 +32 @@
     // Self-correlation term of the core
     const double bes_core = sph_j1c(q*radius_core);
-    const double term1 = n_aggreg*n_aggreg*beta_core*beta_core*bes_core*bes_core;
+    const double term1 = square(n_aggreg*beta_core*bes_core);
 
     // Self-correlation term of the chains
-    const double qrg2 = q*rg*q*rg;
+    const double qrg2 = square(q*rg);
     const double debye_chain = (qrg2 == 0.0) ? 1.0 : 2.0*(expm1(-qrg2)+qrg2)/(qrg2*qrg2);
     const double term2 = n_aggreg * beta_corona * beta_corona * debye_chain;
@@ -42 +42 @@
     const double chain_ampl = (qrg2 == 0.0) ? 1.0 : -expm1(-qrg2)/qrg2;
     const double bes_corona = sinc(q*(radius_core + d_penetration * rg));
-    const double term3 = 2 * n_aggreg * n_aggreg * beta_core * beta_corona *
+    const double term3 = 2.0 * n_aggreg * n_aggreg * beta_core * beta_corona *
                  bes_core * chain_ampl * bes_corona;
 
     // Interference cross-term between chains
-    const double term4 = n_aggreg * (n_aggreg - 1.0) * beta_corona * beta_corona *
-                 chain_ampl * chain_ampl * bes_corona * bes_corona;
+    const double term4 = n_aggreg * (n_aggreg - 1.0)
+                 * square(beta_corona * chain_ampl * bes_corona);
 
     // I(q)_micelle : Sum of 4 terms computed above