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

Timestamp:

Sep 30, 2016 10:42:06 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:

caddb14, 5031ca3

Parents:

2222134

Message:

updating more parameter names addressing #649

File:

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

sasmodels/models/polymer_micelle.c

@@ -7 +7 @@
         double corona_sld,
         double radius_core,
-        double radius_gyr,
+        double rg,
         double d_penetration,
         double n_aggreg);
@@ -19 +19 @@
         double corona_sld,
         double radius_core,
-        double radius_gyr,
+        double rg,
         double d_penetration,
         double n_aggreg)
@@ -35 +35 @@
 
     // Self-correlation term of the chains
-    const double qrg2 = q*radius_gyr*q*radius_gyr;
+    const double qrg2 = q*rg*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;
@@ -41 +41 @@
     // Interference cross-term between core and chains
     const double chain_ampl = (qrg2 == 0.0) ? 1.0 : -expm1(-qrg2)/qrg2;
-    const double bes_corona = sinc(q*(radius_core + d_penetration * radius_gyr));
+    const double bes_corona = sinc(q*(radius_core + d_penetration * rg));
     const double term3 = 2 * n_aggreg * n_aggreg * beta_core * beta_corona *
                  bes_core * chain_ampl * bes_corona;
@@ -70 +70 @@
         double corona_sld,
         double radius_core,
-        double radius_gyr,
+        double rg,
         double d_penetration,
         double n_aggreg)
@@ -82 +82 @@
             corona_sld,
             radius_core,
-            radius_gyr,
+            rg,
             d_penetration,
             n_aggreg);