Changeset bb4b509 in sasmodels for sasmodels/models/stacked_disks.py

Timestamp:

May 16, 2017 10:14:04 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

452b168

Parents:

ba62072

Message:

check parameter names as part of test; PEP8 cleanup

File:

• sasmodels/models/stacked_disks.py (modified) (8 diffs)

sasmodels/models/stacked_disks.py

@@ -156 +156 @@
 qx = q*cos(pi/6.0)
 qy = q*sin(pi/6.0)
-tests = [
 # Accuracy tests based on content in test/utest_extra_models.py.
 # Added 2 tests with n_stacked = 5 using SasView 3.1.2 - PDB;
 # for which alas q=0.001 values seem closer to n_stacked=1 not 5,
 # changed assuming my 4.1 code OK, RKH
-    [{'thick_core': 10.0,
-      'thick_layer': 15.0,
-      'radius': 3000.0,
-      'n_stacking': 1.0,
-      'sigma_d': 0.0,
-      'sld_core': 4.0,
-      'sld_layer': -0.4,
-      'solvent_sd': 5.0,
+tests = [
+    [{'thick_core': 10.0,
+      'thick_layer': 15.0,
+      'radius': 3000.0,
+      'n_stacking': 1.0,
+      'sigma_d': 0.0,
+      'sld_core': 4.0,
+      'sld_layer': -0.4,
+      'sld_solvent': 5.0,
       'theta': 90.0,
       'phi': 0.0,
@@ -181 +181 @@
       'sld_core': 4.0,
       'sld_layer': -0.4,
-      'solvent_sd': 5.0,
+      'sld_solvent': 5.0,
       'theta': 90.0,
       'phi': 0.0,
@@ -196 +196 @@
       'sld_core': 4.0,
       'sld_layer': -0.4,
-      'solvent_sd': 5.0,
+      'sld_solvent': 5.0,
       'theta': 90.0,
       'phi': 20.0,
       'scale': 0.01,
-      'background': 0.001},
-      (qx, qy), 0.0491167089952  ],
+      'background': 0.001,
+     }, (qx, qy), 0.0491167089952],
     [{'thick_core': 10.0,
       'thick_layer': 15.0,
@@ -209 +209 @@
       'sld_core': 4.0,
       'sld_layer': -0.4,
-      'solvent_sd': 5.0,
+      'sld_solvent': 5.0,
       'theta': 90.0,
       'phi': 0.0,
@@ -225 +225 @@
       'sld_core': 4.0,
       'sld_layer': -0.4,
-      'solvent_sd': 5.0,
+      'sld_solvent': 5.0,
       'theta': 90.0,
       'phi': 0.0,
@@ -240 +240 @@
       'sld_core': 4.0,
       'sld_layer': -0.4,
-      'solvent_sd': 5.0,
+      'sld_solvent': 5.0,
       'theta': 90.0,
       'phi': 0.0,
@@ -253 +253 @@
       'sld_core': 4.0,
       'sld_layer': -0.4,
-      'solvent_sd': 5.0,
+      'sld_solvent': 5.0,
       'theta': 90.0,
       'phi': 20.0,
       'scale': 0.01,
       'background': 0.001,
-     }, (qx, qy), 0.0341738733124 ],
-
-    [{'thick_core': 10.0,
-      'thick_layer': 15.0,
-      'radius': 3000.0,
-      'n_stacking': 1.0,
-      'sigma_d': 0.0,
-      'sld_core': 4.0,
-      'sld_layer': -0.4,
-     'solvent_sd': 5.0,
+     }, (qx, qy), 0.0341738733124],
+
+    [{'thick_core': 10.0,
+      'thick_layer': 15.0,
+      'radius': 3000.0,
+      'n_stacking': 1.0,
+      'sigma_d': 0.0,
+      'sld_core': 4.0,
+      'sld_layer': -0.4,
+      'sld_solvent': 5.0,
       'theta': 90.0,
       'phi': 0.0,
@@ -275 +275 @@
     ]
 # 11Jan2017   RKH checking unit test agai, note they are all 1D, no 2D
-