Changeset df0d2ca in sasmodels


Ignore:
Timestamp:
May 17, 2018 8:34:09 PM (3 months ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, ESS_GUI, beta_approx, beta_approx_lazy_results, beta_approx_new_R_eff, doc_update, ticket-1102-pinhole, ticket-1104-resolution, ticket-1112, ticket-1142-plugin-reload, ticket-1148-Sq-scale-background, ticket-608-user-defined-weights
Children:
87964ac
Parents:
1198f90
Message:

update pinhole resolution tests

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/resolution.py

    r1198f90 rdf0d2ca  
    577577 
    578578 
    579 def romberg_pinhole_1d(q, q_width, form, pars, nsigma=5): 
     579def romberg_pinhole_1d(q, q_width, form, pars, nsigma=2.5): 
    580580    """ 
    581581    Romberg integration for pinhole resolution. 
     
    705705        theory = 12.0-1000.0*resolution.q_calc 
    706706        output = resolution.apply(theory) 
     707        # Note: answer came from output of previous run.  Non-integer 
     708        # values at ends come from the fact that q_calc does not 
     709        # extend beyond q, and so the weights don't balance. 
    707710        answer = [ 
    708             10.44785079, 9.84991299, 8.98101708, 
    709             7.99906585, 6.99998311, 6.00001689, 
    710             5.00093415, 4.01898292, 3.15008701, 2.55214921, 
     711            10.47037734, 9.86925860, 
     712            9., 8., 7., 6., 5., 4., 
     713            3.13074140, 2.52962266, 
    711714            ] 
    712715        np.testing.assert_allclose(output, answer, atol=1e-8) 
     
    751754        self._compare(q, output, answer, 1e-6) 
    752755 
     756    @unittest.skip("suppress comparison with old version; pinhole calc changed") 
    753757    def test_pinhole(self): 
    754758        """ 
     
    765769        self._compare(q, output, answer, 3e-4) 
    766770 
     771    @unittest.skip("suppress comparison with old version; pinhole calc changed") 
    767772    def test_pinhole_romberg(self): 
    768773        """ 
     
    780785        #                     2*np.pi/pars['radius']/200) 
    781786        #tol = 0.001 
    782         ## The default 3 sigma and no extra points gets 1% 
     787        ## The default 2.5 sigma and no extra points gets 1% 
    783788        q_calc = None  # type: np.ndarray 
    784789        tol = 0.01 
Note: See TracChangeset for help on using the changeset viewer.