Changeset 9f7fbd9 in sasview for test

Timestamp:

Mar 24, 2015 3:28:54 PM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

66f21cd

Parents:

0efb04d

Message:

rewrite slit smearing for usans

Location:

test

Files:

• pr_inversion/test/test_output.txt (modified) (1 diff)
• sasfit/test/utest_fit_smeared.py (modified) (2 diffs)

test/pr_inversion/test/test_output.txt

@@ -3 +3 @@
 #alpha=0.0007
 #chi2=836.797
-#elapsed=0.00199986
+#elapsed=0.000377893
 #qmin=None
 #qmax=None

test/sasfit/test/utest_fit_smeared.py

@@ -165 +165 @@
     def test_slit(self):
         smear = smear_selection(self.data_slit)
-        self.assertEqual(smear.__class__.__name__, 'SlitSmearer')
+        #self.assertEqual(smear.__class__.__name__, 'SlitSmearer')
+        self.assertEqual(smear.__class__.__name__, 'PySlitSmearer')
 
         fitter = Fit('bumps')
@@ -181 +182 @@
         
         result1, = fitter.fit()
-        
+
         #print "v",result1.pvec
         #print "dv",result1.stderr
         #print "chisq(v)",result1.fitness
-        
-        self.assertTrue( math.fabs(result1.pvec[0]-2340) < 20 )
-        self.assertTrue( math.fabs(result1.pvec[1]-0.010) < 0.002 )
+
+        numpy.testing.assert_allclose(result1.pvec, [2323.466,0.22137], rtol=0.001)
 
 if __name__ == '__main__':