Changeset 30fbe2e in sasmodels for sasmodels/models/mass_surface_fractal.py

Timestamp:

Oct 1, 2016 12:53:30 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:

5b60eeb

Parents:

7c57861

Message:

Last of parameter normalization. Fixes #649

File:

• sasmodels/models/mass_surface_fractal.py (modified) (7 diffs)

sasmodels/models/mass_surface_fractal.py

@@ -69 +69 @@
         fractal_dim_surf  =  Ds
         rg_cluster  =  Rg
-        primary_rg    =  rg
+        rg_primary    =  rg
         background   =  background
         Ref: Schmidt, J Appl Cryst, eq(19), (1991), 24, 414-435
@@ -85 +85 @@
               ["rg_cluster", "Ang",   86.7, [0.0, inf], "",
                "Cluster radius of gyration"],
-              ["primary_rg", "Ang", 4000.,  [0.0, inf], "",
+              ["rg_primary", "Ang", 4000.,  [0.0, inf], "",
                "Primary particle radius of gyration"],
              ]
@@ -96 +96 @@
             fractal_dim_surf=2.3,
             rg_cluster=86.7,
-            primary_rg=4000.0)
+            rg_primary=4000.0)
 
 tests = [
@@ -104 +104 @@
       'fractal_dim_surf':   2.3,
       'rg_cluster':   86.7,
-      'primary_rg': 4000.0,
+      'rg_primary': 4000.0,
       'background':    0.0,
      }, 0.05, 1.77537e-05],
@@ -112 +112 @@
       'fractal_dim_surf':   1.0,
       'rg_cluster':   90.0,
-      'primary_rg': 4000.0,
+      'rg_primary': 4000.0,
      }, 0.001, 0.18562699016],
 
@@ -118 +118 @@
       'fractal_dim_surf':   1.0,
       'rg_cluster':   90.0,
-      'primary_rg': 2000.0,
+      'rg_primary': 2000.0,
       'background':    0.8,
      }, 0.001, 1.16539753641],
@@ -125 +125 @@
       'fractal_dim_surf':   1.0,
       'rg_cluster':   90.0,
-      'primary_rg': 1000.0,
+      'rg_primary': 1000.0,
       'scale':        10.0,
       'background':    0.0,