Changeset 7150766 in sasmodels

Timestamp:

Sep 26, 2016 5:22:47 PM (8 years ago)

Author:

ajj

Parents:

d3e3c46a

Message:

Revert "and fixing the tests in pringle model"

This reverts commit d3e3c46a82983e9359319b596973038fa4ce2d7b.

File:

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

sasmodels/models/pringle.py

@@ -102 +102 @@
       'sld_pringle': 1.0,
       'sld_solvent': 6.3,
-      '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],
+      'background': 6.3,
+     }, 0.1, 16.185532],
 
     [{'scale' : 1.0,
@@ -123 +113 @@
       'sld_solvent': 6.3,
       'background': 6.3,
-     }, 0.001, 317.935],
+     }, 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],
 ]