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

sasmodels/models/mono_gauss_coil.py

@@ -71 +71 @@
 parameters = [
     ["i_zero", "1/cm", 70.0, [0.0, inf], "", "Intensity at q=0"],
-    ["radius_gyration", "Ang", 75.0, [0.0, inf], "", "Radius of gyration"],
+    ["rg", "Ang", 75.0, [0.0, inf], "", "Radius of gyration"],
     ]
 # pylint: enable=bad-whitespace, line-too-long
 
 # NB: Scale and Background are implicit parameters on every model
-def Iq(q, i_zero, radius_gyration):
+def Iq(q, i_zero, rg):
     # pylint: disable = missing-docstring
-    z = (q * radius_gyration)**2
+    z = (q * rg)**2
 
     with errstate(invalid='ignore'):
@@ -86 +86 @@
 Iq.vectorized = True # Iq accepts an array of q values
 
-demo = dict(scale=1.0, i_zero=70.0, radius_gyration=75.0, background=0.0)
+demo = dict(scale=1.0, i_zero=70.0, rg=75.0, background=0.0)
 
 # these unit test values taken from SasView 3.1.2
 tests = [
-    [{'scale': 1.0, 'i_zero': 70.0, 'radius_gyration': 75.0, 'background': 0.0},
+    [{'scale': 1.0, 'i_zero': 70.0, 'rg': 75.0, 'background': 0.0},
      [0.0106939, 0.469418], [57.1241, 0.112859]],
     ]