Changeset b517792 in sasview for sansdataloader/test/utest_averaging.py

Timestamp:

Dec 9, 2011 12:42:35 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

849fa92

Parents:

b57e704

Message:

test reference values are updated: there were # of reasons why they failed. 1)we now use degree (instead of rad) staring from the right-x-axis. 2) many corrections made in computation to get consistent with igor. 3) now 2d uses points instead of pixels. But these reference values are just current outputs. Todo: we need to test this averaging more.

File:

• sansdataloader/test/utest_averaging.py (modified) (7 diffs)

sansdataloader/test/utest_averaging.py

@@ -125 +125 @@
         
         o = r(self.data)
+
         answer = Loader().load('avg_testdata.txt')
         for i in range(r.nbins_phi):
@@ -140 +141 @@
         r = Boxsum(x_min=.01, x_max=.015, y_min=0.01, y_max=0.015)
         s, ds = r(self.data)
-        self.assertAlmostEqual(s, 151.81809601016641, 4)
-        self.assertAlmostEqual(ds, 16.245399156009537, 4)
+        self.assertAlmostEqual(s, 34.278990899999997, 4)
+        self.assertAlmostEqual(ds, 7.8007981835194293, 4)
     
         r = Boxavg(x_min=.01, x_max=.015, y_min=0.01, y_max=0.015)
         s, ds = r(self.data)
-        self.assertAlmostEqual(s, 0.11195555855955155, 4)
-        self.assertAlmostEqual(ds, 0.011979881083557541, 4)
+        self.assertAlmostEqual(s, 0.10579935462962962, 4)
+        self.assertAlmostEqual(ds, 0.024076537603455028, 4)
             
     def test_slabX(self):
@@ -158 +159 @@
         r.fold = False
         o = r(self.data)
-    
+
         answer = Loader().load('slabx_testdata.txt')
         for i in range(len(o.x)):
@@ -175 +176 @@
         r.fold = False
         o = r(self.data)
-    
+
         answer = Loader().load('slaby_testdata.txt')
         for i in range(len(o.x)):
@@ -195 +196 @@
         r.nbins_phi = 20
         o = r(self.data)
-    
+
         answer = Loader().load('ring_testdata.txt')
         for i in range(len(o.x)):
@@ -213 +214 @@
         r.nbins_phi = 20
         o = r(self.data)
-    
+
         answer = Loader().load('sectorphi_testdata.txt')
         for i in range(len(o.x)):
@@ -231 +232 @@
         r.nbins_phi = 20
         o = r(self.data)
-    
+
         answer = Loader().load('sectorq_testdata.txt')
         for i in range(len(o.x)):