Changeset df0d2ca in sasmodels

Timestamp:

May 17, 2018 8:34:09 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

87964ac

Parents:

1198f90

Message:

update pinhole resolution tests

File:

• sasmodels/resolution.py (modified) (5 diffs)

sasmodels/resolution.py

@@ -577 +577 @@
 
 
-def romberg_pinhole_1d(q, q_width, form, pars, nsigma=5):
+def romberg_pinhole_1d(q, q_width, form, pars, nsigma=2.5):
     """
     Romberg integration for pinhole resolution.
@@ -705 +705 @@
         theory = 12.0-1000.0*resolution.q_calc
         output = resolution.apply(theory)
+        # Note: answer came from output of previous run.  Non-integer
+        # values at ends come from the fact that q_calc does not
+        # extend beyond q, and so the weights don't balance.
         answer = [
-            10.44785079, 9.84991299, 8.98101708,
-            7.99906585, 6.99998311, 6.00001689,
-            5.00093415, 4.01898292, 3.15008701, 2.55214921,
+            10.47037734, 9.86925860,
+            9., 8., 7., 6., 5., 4.,
+            3.13074140, 2.52962266,
             ]
         np.testing.assert_allclose(output, answer, atol=1e-8)
@@ -751 +754 @@
         self._compare(q, output, answer, 1e-6)
 
+    @unittest.skip("suppress comparison with old version; pinhole calc changed")
     def test_pinhole(self):
         """
@@ -765 +769 @@
         self._compare(q, output, answer, 3e-4)
 
+    @unittest.skip("suppress comparison with old version; pinhole calc changed")
     def test_pinhole_romberg(self):
         """
@@ -780 +785 @@
         #                     2*np.pi/pars['radius']/200)
         #tol = 0.001
-        ## The default 3 sigma and no extra points gets 1%
+        ## The default 2.5 sigma and no extra points gets 1%
         q_calc = None  # type: np.ndarray
         tol = 0.01