Changeset b297ba9 in sasmodels for sasmodels/models/fractal_core_shell.py

Timestamp:

Mar 20, 2019 5:03:50 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

4e28511

Parents:

0d362b7

Message:

lint

File:

• sasmodels/models/fractal_core_shell.py (modified) (4 diffs)

sasmodels/models/fractal_core_shell.py

@@ -60 +60 @@
 
 import numpy as np
-from numpy import pi, inf
+from numpy import inf
 
 name = "fractal_core_shell"
@@ -98 +98 @@
 
 def random():
+    """Return a random parameter set for the model."""
     outer_radius = 10**np.random.uniform(0.7, 4)
     # Use a distribution with a preference for thin shell or thin core
@@ -126 +127 @@
             cor_length=100.0)
 
+# TODO: why is there an ER function here?
 def ER(radius, thickness):
     """
@@ -136 +138 @@
 #tests = [[{'radius': 20.0, 'thickness': 10.0}, 'ER', 30.0],
 tests = [
-#         # At some point the SasView 3.x test result was deemed incorrect. The
-          #following tests were verified against NIST IGOR macros ver 7.850.
-          #NOTE: NIST macros do only provide for a polydispers core (no option
-          #for a poly shell or for a monodisperse core.  The results seemed
-          #extremely sensitive to the core PD, varying non monotonically all
-          #the way to a PD of 1e-6. From 1e-6 to 1e-9 no changes in the
-          #results were observed and the values below were taken using PD=1e-9.
-          #Non-monotonically = I(0.001)=188 to 140 to 177 back to 160 etc.
-         [{'radius': 20.0,
-           'thickness': 5.0,
-           'sld_core': 3.5,
-           'sld_shell': 1.0,
-           'sld_solvent': 6.35,
-           'volfraction': 0.05,
-           'background': 0.0},
-           [0.001,0.00291,0.0107944,0.029923,0.100726,0.476304],
-           [177.146,165.151,84.1596,20.1466,1.40906,0.00622666]]]
+    # At some point the SasView 3.x test result was deemed incorrect.  The
+    # following tests were verified against NIST IGOR macros ver 7.850.
+    # NOTE: NIST macros do only provide for a polydispers core (no option
+    # for a poly shell or for a monodisperse core.  The results seemed
+    # extremely sensitive to the core PD, varying non monotonically all
+    # the way to a PD of 1e-6. From 1e-6 to 1e-9 no changes in the
+    # results were observed and the values below were taken using PD=1e-9.
+    # Non-monotonically = I(0.001)=188 to 140 to 177 back to 160 etc.
+    [{'radius': 20.0,
+      'thickness': 5.0,
+      'sld_core': 3.5,
+      'sld_shell': 1.0,
+      'sld_solvent': 6.35,
+      'volfraction': 0.05,
+      'background': 0.0},
+     [0.001, 0.00291, 0.0107944, 0.029923, 0.100726, 0.476304],
+     [177.146, 165.151, 84.1596, 20.1466, 1.40906, 0.00622666]
+    ]
+]