Changeset a807206 in sasmodels for sasmodels/models/surface_fractal.py

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/surface_fractal.py (modified) (5 diffs)

sasmodels/models/surface_fractal.py

@@ -66 +66 @@
         delta        =  sldParticle -sldSolv.
         radius       =  Particle radius
-        surface_dim  =  Surface fractal dimension (Ds)
+        fractal_dim_surf  =  Surface fractal dimension (Ds)
         co_length    =  Cut-off length
         background   =  background
 
         Ref.   :Mildner, Hall,J Phys D Appl Phys(1986), 19, 1535-1545
-        Note I : This model is valid for 1<surface_dim<3 with limited q range.
+        Note I : This model is valid for 1<fractal_dim_surf<3 with limited q range.
         Note II: This model is not in absolute scale.
 """
@@ -80 +80 @@
 parameters = [["radius",        "Ang", 10.0, [0, inf],   "",
                "Particle radius"],
-              ["surface_dim",   "",    2.0,  [1, 3],   "",
+              ["fractal_dim_surf",   "",    2.0,  [1, 3],   "",
                "Surface fractal dimension"],
               ["cutoff_length", "Ang", 500., [0.0, inf], "",
@@ -90 +90 @@
 
 demo = dict(scale=1, background=0,
-            radius=10, surface_dim=2.0, cutoff_length=500)
+            radius=10, fractal_dim_surf=2.0, cutoff_length=500)
 
 tests = [
     # Accuracy tests based on content in test/utest_other_models.py
     [{'radius': 10.0,
-      'surface_dim': 2.0,
+      'fractal_dim_surf': 2.0,
       'cutoff_length': 500.0,
      }, 0.05, 301428.66016],
@@ -101 +101 @@
     # Additional tests with larger range of parameters
     [{'radius': 1.0,
-      'surface_dim': 1.0,
+      'fractal_dim_surf': 1.0,
       'cutoff_length': 10.0,
      }, 0.332070182643, 1125.00421004],
 
     [{'radius': 3.5,
-      'surface_dim': 0.1,
+      'fractal_dim_surf': 0.1,
       'cutoff_length': 30.0,
       'background': 0.01,
@@ -112 +112 @@
 
     [{'radius': 3.0,
-      'surface_dim': 1.0,
+      'fractal_dim_surf': 1.0,
       'cutoff_length': 33.0,
       'scale': 0.1,