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

sasmodels/models/mass_fractal.c

@@ -3 +3 @@
 double Iq(double q,
           double radius,
-          double mass_dim,
+          double fractal_dim_mass,
           double cutoff_length);
 
 static double _mass_fractal_kernel(double q,
           double radius,
-          double mass_dim,
+          double fractal_dim_mass,
           double cutoff_length)
 {
     // Actively check the argument.
-    if (mass_dim <= 1.0){
+    if (fractal_dim_mass <= 1.0){
        return 0.0;
     }
@@ -21 +21 @@
 
     //calculate S(q)
-    double mmo = mass_dim-1.0;
+    double mmo = fractal_dim_mass-1.0;
     double sq = sas_gamma(mmo)*sin((mmo)*atan(q*cutoff_length));
     sq *= pow(cutoff_length, mmo);
@@ -39 +39 @@
 double Iq(double q,
           double radius,
-          double mass_dim,
+          double fractal_dim_mass,
           double cutoff_length)
 {
     return _mass_fractal_kernel(q,
            radius,
-           mass_dim,
+           fractal_dim_mass,
            cutoff_length);
 }