Changeset a807206 in sasmodels for sasmodels/models/gel_fit.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/gel_fit.c (modified) (2 diffs)

sasmodels/models/gel_fit.c

@@ -1 +1 @@
 static double Iq(double q,
           double guinier_scale,
-          double lorentzian_scale,
-          double gyration_radius,
-          double fractal_exp,
+          double lorentz_scale,
+          double rg,
+          double fractal_dim,
           double cor_length)
 {
@@ -9 +9 @@
     ////////////////////////double a(x[i]*x[i]*zeta*zeta);
     double lorentzian_term = square(q*cor_length);
-    lorentzian_term = 1.0 + ((fractal_exp + 1.0)/3.0)*lorentzian_term;
-    lorentzian_term = pow(lorentzian_term, (fractal_exp/2.0) );
+    lorentzian_term = 1.0 + ((fractal_dim + 1.0)/3.0)*lorentzian_term;
+    lorentzian_term = pow(lorentzian_term, (fractal_dim/2.0) );
 
     // Exponential Term
     ////////////////////////double d(x[i]*x[i]*rg*rg);
-    double exp_term = square(q*gyration_radius);
+    double exp_term = square(q*rg);
     exp_term = exp(-1.0*(exp_term/3.0));
 
     // Scattering Law
-    double result = lorentzian_scale/lorentzian_term + guinier_scale*exp_term;
+    double result = lorentz_scale/lorentzian_term + guinier_scale*exp_term;
     return result;
 }