Changeset 2d81cfe in sasmodels for sasmodels/models/lamellar.py

Timestamp:

Nov 29, 2017 11:13:23 AM (6 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:

237b800f

Parents:

a839b22

Message:

lint

File:

• sasmodels/models/lamellar.py (modified) (3 diffs)

sasmodels/models/lamellar.py

@@ -43 +43 @@
 
 also in J. Phys. Chem. B, 105, (2001) 11081-11088
-
-
 """
 
+import numpy as np
 from numpy import inf
 
@@ -90 +89 @@
 
 def random():
-    import numpy as np
     thickness = 10**np.random.uniform(1, 4)
     pars = dict(
@@ -104 +102 @@
             thickness=40,
             thickness_pd=0.2, thickness_pd_n=40)
+#  [(qx1, qy1), (qx2, qy2), ...], [I(qx1,qy1), I(qx2,qy2), ...]],
 tests = [
-        [ {'scale': 1.0, 'background': 0.0, 'thickness': 50.0,
-           'sld': 1.0, 'sld_solvent': 6.3, 'thickness_pd': 0.0},
-          [0.001], [882289.54309]]
-        ]
-# ADDED by: converted by PAK? (or RKH?)     ON: 16Mar2016 - RKH adding unit tests from sasview to early 2015 conversion
-#  [(qx1, qy1), (qx2, qy2), ...], [I(qx1,qy1), I(qx2,qy2), ...]],
+    [{'scale': 1.0, 'background': 0.0, 'thickness': 50.0,
+      'sld': 1.0, 'sld_solvent': 6.3, 'thickness_pd': 0.0},
+     [0.001], [882289.54309]]
+]
+# ADDED by: converted by PAK? (or RKH?)
+# ON: 16Mar2016 - RKH adding unit tests from sasview to early 2015 conversion