Changeset fcb33e4 in sasmodels for sasmodels/models/core_shell_ellipsoid.py

Timestamp:

Jan 4, 2017 6:09:53 AM (7 years ago)

Author:

richardh

Branches:

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

Children:

473a9f1, b7e8b94

Parents:

64614ad

Message:

new model core_shell_bicelle_elliptical, not tested for 2d, docu changes for other cylinder models

File:

• sasmodels/models/core_shell_ellipsoid.py (modified) (1 diff)

sasmodels/models/core_shell_ellipsoid.py

@@ -166 +166 @@
 qy = q*sin(phi)
 # After redefinition of angles find new reasonable values for unit test
-#tests = [
-#    # Accuracy tests based on content in test/utest_coreshellellipsoidXTmodel.py
-#    [{'radius_equat_core': 200.0,
-#      'x_core': 0.1,
-#      'thick_shell': 50.0,
-#      'x_polar_shell': 0.2,
-#      'sld_core': 2.0,
-#      'sld_shell': 1.0,
-#      'sld_solvent': 6.3,
-#      'background': 0.001,
-#      'scale': 1.0,
-#     }, 1.0, 0.00189402],
+tests = [
+     # Accuracy tests based on content in test/utest_coreshellellipsoidXTmodel.py
+    [{'radius_equat_core': 200.0,
+      'x_core': 0.1,
+      'thick_shell': 50.0,
+      'x_polar_shell': 0.2,
+      'sld_core': 2.0,
+      'sld_shell': 1.0,
+      'sld_solvent': 6.3,
+      'background': 0.001,
+      'scale': 1.0,
+     }, 1.0, 0.00189402],
 
     # Additional tests with larger range of parameters
-#    [{'background': 0.01}, 0.1, 11.6915],
-
-#    [{'radius_equat_core': 20.0,
-#      'x_core': 200.0,
-#      'thick_shell': 54.0,
-#      'x_polar_shell': 3.0,
-#      'sld_core': 20.0,
-#      'sld_shell': 10.0,
-#      'sld_solvent': 6.0,
-#      'background': 0.0,
-#      'scale': 1.0,
-#     }, 0.01, 8688.53],
-
-#   [{'background': 0.001}, (0.4, 0.5), 0.00690673],
-
-#   [{'radius_equat_core': 20.0,
-#      'x_core': 200.0,
-#      'thick_shell': 54.0,
-#      'x_polar_shell': 3.0,
-#      'sld_core': 20.0,
-#      'sld_shell': 10.0,
-#      'sld_solvent': 6.0,
-#      'background': 0.01,
-#      'scale': 0.01,
-#     }, (qx, qy), 0.0100002],
-#    ]
+    [{'background': 0.01}, 0.1, 11.6915],
+
+    [{'radius_equat_core': 20.0,
+      'x_core': 200.0,
+      'thick_shell': 54.0,
+      'x_polar_shell': 3.0,
+      'sld_core': 20.0,
+      'sld_shell': 10.0,
+      'sld_solvent': 6.0,
+      'background': 0.0,
+      'scale': 1.0,
+     }, 0.01, 8688.53],
+
+    [{'background': 0.001}, (0.4, 0.5), 0.00690673],
+
+   [{'radius_equat_core': 20.0,
+      'x_core': 200.0,
+      'thick_shell': 54.0,
+      'x_polar_shell': 3.0,
+      'sld_core': 20.0,
+      'sld_shell': 10.0,
+      'sld_solvent': 6.0,
+      'background': 0.01,
+      'scale': 0.01,
+# assuming theta and phi zero here?
+     }, (qx, qy), 0.01000025],
+    ]