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

Timestamp:

Oct 1, 2016 12:42:06 AM (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/mass_surface_fractal.c (modified) (3 diffs)

sasmodels/models/mass_surface_fractal.c

@@ -2 +2 @@
 
 double Iq(double q,
-          double mass_dim,
-          double surface_dim,
-          double cluster_rg,
+          double fractal_dim_mass,
+          double fractal_dim_surf,
+          double rg_cluster,
           double primary_rg);
 
 static double _mass_surface_fractal_kernel(double q,
-          double mass_dim,
-          double surface_dim,
-          double cluster_rg,
+          double fractal_dim_mass,
+          double fractal_dim_surf,
+          double rg_cluster,
           double primary_rg)
 {
      //computation
-    double tot_dim = 6.0 - surface_dim - mass_dim;
-    mass_dim /= 2.0;
+    double tot_dim = 6.0 - fractal_dim_surf - fractal_dim_mass;
+    fractal_dim_mass /= 2.0;
     tot_dim /= 2.0;
 
-    double rc_norm = cluster_rg * cluster_rg / (3.0 * mass_dim);
+    double rc_norm = rg_cluster * rg_cluster / (3.0 * fractal_dim_mass);
     double rp_norm = primary_rg * primary_rg / (3.0 * tot_dim);
 
@@ -25 +25 @@
     double x_val2 = 1.0 +  q * q * rp_norm;
 
-    double inv_form = pow(x_val1, mass_dim) * pow(x_val2, tot_dim);
+    double inv_form = pow(x_val1, fractal_dim_mass) * pow(x_val2, tot_dim);
 
     //another singular
@@ -41 +41 @@
 
 double Iq(double q,
-          double mass_dim,
-          double surface_dim,
-          double cluster_rg,
+          double fractal_dim_mass,
+          double fractal_dim_surf,
+          double rg_cluster,
           double primary_rg)
 {
     return _mass_surface_fractal_kernel(q,
-            mass_dim,
-            surface_dim,
-            cluster_rg,
+            fractal_dim_mass,
+            fractal_dim_surf,
+            rg_cluster,
             primary_rg);
 }