Changeset 639042e in sasmodels

Timestamp:

Sep 26, 2016 5:23:25 PM (8 years ago)

Author:

ajj

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

5fd684d

Parents:

58c3367

git-author:

Andrew Jackson <andrew.jackson@…> (09/26/16 17:16:34)

git-committer:

Andrew Jackson <andrew.jackson@…> (09/26/16 17:23:25)

Message:

and fixing the tests in pringle model

File:

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

sasmodels/models/pringle.py

@@ -102 +102 @@
       'sld_pringle': 1.0,
       'sld_solvent': 6.3,
-      'background': 6.3,
-     }, 0.1, 16.185532],
+      'background': 0.001,
+     }, 0.1, 9.88653],
+
+    [{'scale' : 1.0,
+      'radius': 60.0,
+      'thickness': 10.0,
+      'alpha': 0.001,
+      'beta': 0.02,
+      'sld_pringle': 1.0,
+      'sld_solvent': 6.3,
+      'background': 0.001,
+     }, 0.01, 290.854],
 
     [{'scale' : 1.0,
@@ -113 +123 @@
       'sld_solvent': 6.3,
       'background': 6.3,
-     }, 0.01, 297.153496],
-
-    [{'scale' : 1.0,
-      'radius': 60.0,
-      'thickness': 10.0,
-      'alpha': 0.001,
-      'beta': 0.02,
-      'sld_pringle': 1.0,
-      'sld_solvent': 6.3,
-      'background': 6.3,
-     }, 0.001, 324.021256415],
-
-    [{'scale' : 1.0,
-      'radius': 60.0,
-      'thickness': 10.0,
-      'alpha': 0.001,
-      'beta': 0.02,
-      'sld_pringle': 1.0,
-      'sld_solvent': 6.3,
-      'background': 6.3,
-     }, (0.001, 90.0), 6.30000026876],
+     }, 0.001, 317.935],
 ]