Changeset 0d6e865 in sasmodels for sasmodels/models/core_shell_bicelle.py

Timestamp:

Oct 11, 2016 11:42:00 AM (8 years ago)

Author:

dirk

Branches:

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

Children:

1fdb555

Parents:

19e7ca7

Message:

Rewriting selected models in spherical coordinates. This fixes ticket #492 for these models.

File:

• sasmodels/models/core_shell_bicelle.py (modified) (2 diffs)

sasmodels/models/core_shell_bicelle.py

@@ -71 +71 @@
     Definition of the angles for the oriented core shell bicelle tmodel.
 
-.. figure:: img/cylinder_angle_projection.jpg
-    :width: 600px
-
-    Examples of the angles for oriented pp against the detector plane.
 
 References
@@ -161 +157 @@
 
 qx, qy = 0.4 * cos(90), 0.5 * sin(0)
-tests = [
-    # Accuracy tests based on content in test/utest_other_models.py
-    [{'radius': 20.0,
-      'thick_rim': 10.0,
-      'thick_face': 10.0,
-      'length': 400.0,
-      'sld_core': 1.0,
-      'sld_face': 4.0,
-      'sld_rim': 4.0,
-      'sld_solvent': 1.0,
-      'background': 0.0,
-     }, 0.001, 353.550],
-
-    [{'radius': 20.0,
-      'thick_rim': 10.0,
-      'thick_face': 10.0,
-      'length': 400.0,
-      'sld_core': 1.0,
-      'sld_face': 4.0,
-      'sld_rim': 4.0,
-      'sld_solvent': 1.0,
-      'theta': 90.0,
-      'phi': 0.0,
-      'background': 0.00,
-     }, (qx, qy), 24.9167],
-
-    # Additional tests with larger range of parameters
-    [{'radius': 3.0,
-      'thick_rim': 100.0,
-      'thick_face': 100.0,
-      'length': 1200.0,
-      'sld_core': 5.0,
-      'sld_face': 41.0,
-      'sld_rim': 42.0,
-      'sld_solvent': 21.0,
-     }, 0.05, 1670.1828],
-    ]