Changeset 35ac8df in sasview for test/sasdataloader

Timestamp:

Aug 21, 2018 9:20:27 AM (6 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

c2525bf

Parents:

96d06a4 (diff), ec52ea1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket-1111

Location:

test/sasdataloader/test

Files:

• utest_abs_reader.py (modified) (1 diff)
• cansas_1Dand2D_multiplesasentry_multiplesasdata.h5 (deleted)
• cansas_1Dand2D_samedatafile.h5 (deleted)
• cansas_1Dand2D_samesasentry.h5 (deleted)
• test_data/MAR07232_rest.h5 (moved) (moved from test/sasdataloader/test/MAR07232_rest.h5)
• test_data/avg_testdata.txt (moved) (moved from test/sasdataloader/test/avg_testdata.txt) (1 diff)
• test_data/nxcansas_1Dand2D_multisasdata.h5 (added)
• test_data/nxcansas_1Dand2D_multisasentry.h5 (added)
• test_data/nxcansas_1Dand2D_multisasentry_multisasdata.h5 (added)
• test_data/ring_testdata.txt (moved) (moved from test/sasdataloader/test/ring_testdata.txt) (1 diff)
• test_data/sectorphi_testdata.txt (moved) (moved from test/sasdataloader/test/sectorphi_testdata.txt) (1 diff)
• test_data/sectorq_testdata.txt (moved) (moved from test/sasdataloader/test/sectorq_testdata.txt) (1 diff)
• test_data/slabx_testdata.txt (moved) (moved from test/sasdataloader/test/slabx_testdata.txt) (1 diff)
• test_data/slaby_testdata.txt (moved) (moved from test/sasdataloader/test/slaby_testdata.txt) (1 diff)
• utest_averaging.py (modified) (10 diffs)
• utest_cansas.py (modified) (6 diffs)
• utest_red2d_reader.py (modified) (1 diff)

test/sasdataloader/test/utest_abs_reader.py

@@ -53 +53 @@
 
         self.assertEqual(self.data.y_unit, 'cm^{-1}')
-        self.assertEqual(self.data.x[0], 0.002618)
-        self.assertEqual(self.data.x[1], 0.007854)
-        self.assertEqual(self.data.x[2], 0.01309)
+        self.assertEqual(self.data.x[0], 0.008082)
+        self.assertEqual(self.data.x[1], 0.0275)
+        self.assertEqual(self.data.x[2], 0.02762)
         self.assertEqual(self.data.x[126], 0.5828)
 

test/sasdataloader/test/test_data/avg_testdata.txt

@@ -1 +1 @@
 0.00019987186878 -0.01196215 0.148605728355
-0.000453772721237 0.02091606 0.0680283029334
-0.000750492390439 -0.01337855 0.0444902910757
-0.00103996394336 0.03062 0.0580312894528
-0.0013420198959 0.0811008333333 0.0540469289108
-0.001652061869 0.167022288372 0.0651891320031
-0.00196086470492 27.5554711176 0.735053300957
+0.000453772721237 0.02091606 0.23372601
+0.000750492390439 -0.01337855 0.17169562
+0.00103996394336 0.03062 0.13136407
+0.0013420198959 0.0811008333333 0.10681163
+0.001652061869 0.167022288372 0.10098903
+0.00196086470492 27.5554711176 0.7350533
 0.00226262401224 105.031578947 1.35744586624
 0.00256734439716 82.1791776119 1.10749938588

test/sasdataloader/test/test_data/ring_testdata.txt

@@ -4 +4 @@
 0.628318530718 0.964040908176 0.0790933208542
 0.942477796077 0.922142905769 0.0781616076625
-1.25663706144 1.02710537736 0.080875897538
+1.25663706144 1.02710537736 0.08136351514804
 1.57079632679 1.01448978075 0.0808313893873
 1.88495559215 1.04677136013 0.0828850195035

test/sasdataloader/test/test_data/sectorphi_testdata.txt

@@ -13 +13 @@
 0.981747704247 0.893411561538 0.151685984204
 1.06028752059 0.86231787 0.152618707077
-1.13882733693 1.0607364925 0.164276150316
+1.13882733693 1.0607364925 0.166167546658
 1.21736715327 1.0684421475 0.163649496829
-1.29590696961 1.09330437436 0.167871645263
+1.29590696961 1.09330437436 0.16981858402
 1.37444678595 0.88759347 0.150974201439
 1.45298660229 1.1352002 0.172191803977

test/sasdataloader/test/test_data/sectorq_testdata.txt

@@ -17 +17 @@
 0.00913119845523 0.405669568421 0.0705339106673
 0.00938052380065 0.331241946 0.061307573431
-0.00962825731078 0.237315993939 0.0578654769893
+0.00962825731078 0.237315993939 0.059602636160850493
 0.00987552050718 0.296916590385 0.0592796733987

test/sasdataloader/test/test_data/slabx_testdata.txt

@@ -21 +21 @@
 -0.00184475260646 2.40154 1.09579651396
 -0.00143541414791 0.065281 0.198049867458
--0.00102607559383 -0.04767235 0.154389685536
--0.000616736954402 -0.0090503 0.0960105462957
+-0.00102607559383 -0.04767235 0.52329358394690839
+-0.000616736954402 -0.0090503 0.36635778277525377
 -0.000207398273925 0.03109325 0.246629023029
-0.000201940423805 -0.027508775 0.082928847514
+0.000201940423805 -0.027508775 0.36314899662535211
 0.000611279108096 0.03251315 0.246951260373
-0.00102061774154 -0.00987975 0.144233534589
-0.00142995630705 0.075937 0.19485507435
+0.00102061774154 -0.00987975 0.38184199939241886
+0.00142995630705 0.075937 0.53662696540520582
 0.00183929475361 10.60918375 1.62858709853
 0.00224863307777 106.2485 7.2886384188

test/sasdataloader/test/test_data/slaby_testdata.txt

@@ -1 @@
--0.00981587154747 0.197046827778 0.0872226309261
+-0.00981587154747 0.197046827778 0.09153902
 -0.00940654133769 0.2466434 0.124972263589
 -0.0089972103454 0.218745969444 0.0838510368061
 -0.00858787875434 0.126093522222 0.107482002513
--0.00817854644886 0.310427366667 0.100945289852
+-0.00817854644886 0.310427366667 0.10469745
 -0.0077692135991 0.0843802722222 0.103942898914
 -0.00735988010303 0.246036369444 0.0916479235889

test/sasdataloader/test/utest_averaging.py

@@ -106 +106 @@
 
     def setUp(self):
-        filepath = find('MAR07232_rest.h5')
+        filepath = find('test_data//MAR07232_rest.h5')
         self.data_list = Loader().load(filepath)
         self.data = self.data_list[0]
@@ -121 +121 @@
 
         o = r(self.data)
-        filepath = find('ring_testdata.txt')
+        filepath = find('test_data//ring_testdata.txt')
         answer_list = Loader().load(filepath)
         answer = answer_list[0]
@@ -142 +142 @@
         o = r(self.data)
 
-        filepath = find('avg_testdata.txt')
+        filepath = find('test_data//avg_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(r.nbins_phi):
@@ -158 +158 @@
         s, ds, npoints = r(self.data)
         self.assertAlmostEqual(s, 34.278990899999997, 4)
-        self.assertAlmostEqual(ds, 7.8007981835194293, 4)
+        self.assertAlmostEqual(ds, 8.237259999538685, 4)
         self.assertAlmostEqual(npoints, 324.0000, 4)
 
@@ -164 +164 @@
         s, ds = r(self.data)
         self.assertAlmostEqual(s, 0.10579935462962962, 4)
-        self.assertAlmostEqual(ds, 0.024076537603455028, 4)
+        self.assertAlmostEqual(ds, 0.02542364197388483, 4)
 
     def test_slabX(self):
@@ -177 +177 @@
         o = r(self.data)
 
-        filepath = find('slabx_testdata.txt')
+        filepath = find('test_data//slabx_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -195 +195 @@
         o = r(self.data)
 
-        filepath = find('slaby_testdata.txt')
+        filepath = find('test_data//slaby_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -221 +221 @@
         o = r(self.data)
 
-        filepath = find('ring_testdata.txt')
+        filepath = find('test_data//ring_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -238 +238 @@
         o = r(self.data)
 
-        filepath = find('sectorphi_testdata.txt')
+        filepath = find('test_data//sectorphi_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):
@@ -255 +255 @@
         o = r(self.data)
 
-        filepath = find('sectorq_testdata.txt')
+        filepath = find('test_data//sectorq_testdata.txt')
         answer = Loader().load(filepath)[0]
         for i in range(len(o.x)):

test/sasdataloader/test/utest_cansas.py

@@ -91 +91 @@
         reader = XMLreader(self.xml_valid, self.schema_1_0)
         valid = reader.validate_xml()
-        if valid:
-            self.assertTrue(valid)
-        else:
-            self.assertFalse(valid)
+        self.assertTrue(valid)
 
     def _check_data(self, data):
@@ -193 +190 @@
     def test_save_cansas_v1_0(self):
         xmlreader = XMLreader(self.isis_1_0, self.schema_1_0)
-        valid = xmlreader.validate_xml()
-        self.assertTrue(valid)
+        self.assertTrue(xmlreader.validate_xml())
         reader_generic = Loader()
         dataloader = reader_generic.load(self.isis_1_0)
@@ -207 +203 @@
             return_data = reader2.read(self.write_1_0_filename)
             written_data = return_data[0]
-            XMLreader(self.write_1_0_filename, self.schema_1_0)
-            valid = xmlreader.validate_xml()
-            self.assertTrue(valid)
+            xmlreader = XMLreader(self.write_1_0_filename, self.schema_1_0)
+            self.assertTrue(xmlreader.validate_xml())
             self._check_data(written_data)
         if os.path.isfile(self.write_1_0_filename):
@@ -260 +255 @@
         self.loader = Loader()
         self.datafile_basic = find("simpleexamplefile.h5")
-        self.datafile_multiplesasentry = find("cansas_1Dand2D_samedatafile.h5")
-        self.datafile_multiplesasdata = find("cansas_1Dand2D_samesasentry.h5")
-        self.datafile_multiplesasdata_multiplesasentry = find("cansas_1Dand2D_multiplesasentry_multiplesasdata.h5")
+        self.datafile_multiplesasentry = find(
+            "test_data//nxcansas_1Dand2D_multisasdata.h5")
+        self.datafile_multiplesasdata = find(
+            "test_data//nxcansas_1Dand2D_multisasentry.h5")
+        self.datafile_multiplesasdata_multiplesasentry = find(
+            "test_data//nxcansas_1Dand2D_multisasentry_multisasdata.h5")
 
     def test_real_data(self):
@@ -273 +271 @@
         self._check_multiple_data(self.data[0])
         self._check_multiple_data(self.data[1])
-        self._check_1d_data(self.data[0])
+        if isinstance(self.data[0], Data1D):
+            self._check_1d_data(self.data[0])
+            self._check_2d_data(self.data[1])
+        else:
+            self._check_1d_data(self.data[1])
+            self._check_2d_data(self.data[0])
 
     def _check_multiple_data(self, data):
@@ -281 +284 @@
         self.assertTrue(data.instrument == "SANS2D")
         self.assertTrue(data.source.radiation == "Spallation Neutron Source")
-        self.assertTrue(len(data.detector) == 1)
-        self.assertTrue(data.detector[0].name == "rear-detector")
-        self.assertTrue(data.detector[0].distance == 4.385281)
-        self.assertTrue(data.detector[0].distance_unit == 'm')
+        self.assertTrue(len(data.detector) == 2)
+        self.assertTrue(data.detector[0].name == "rear-detector"
+                        or data.detector[1].name == "rear-detector")
+        self.assertTrue(data.detector[0].name == "front-detector"
+                        or data.detector[1].name == "front-detector")
+        self.assertAlmostEqual(data.detector[0].distance +
+                               data.detector[1].distance, 7230.54, 2)
+        self.assertTrue(data.detector[0].distance_unit == 'mm')
         self.assertTrue(len(data.trans_spectrum) == 1)
 
     def _check_1d_data(self, data):
-        self.assertTrue(isinstance(data, Data1D))
         self.assertTrue(len(data.x) == 66)
         self.assertTrue(len(data.x) == len(data.y))
-        self.assertTrue(data.dy[10] == 0.20721350111248701)
-        self.assertTrue(data.y[10] == 24.193889608153476)
-        self.assertTrue(data.x[10] == 0.008981127988654792)
+        self.assertTrue(data.dy[10] == 0.207214)
+        self.assertTrue(data.y[10] == 24.1939)
+        self.assertTrue(data.x[10] == 0.00898113)
 
     def _check_2d_data(self, data):
         self.assertTrue(isinstance(data, Data2D))
-        self.assertTrue(len(data.x) == 66)
-        self.assertTrue(len(data.x) == len(data.y))
-        self.assertTrue(data.dy[10] == 0.20721350111248701)
-        self.assertTrue(data.y[10] == 24.193889608153476)
-        self.assertTrue(data.x[10] == 0.008981127988654792)
+        self.assertTrue(len(data.q_data) == 150*150)
+        self.assertTrue(len(data.q_data) == len(data.data))
+        print(data.err_data[10])
+        self.assertAlmostEqual(data.err_data[10], 0.186723989418)
+        self.assertAlmostEqual(data.data[10], 0.465181425808)
+        self.assertAlmostEqual(data.qx_data[10], -0.129)
+        self.assertAlmostEqual(data.qy_data[10], -0.149)
 
     def _check_example_data(self, data):

test/sasdataloader/test/utest_red2d_reader.py

@@ -31 +31 @@
         self.assertEqual(f.qx_data[0],-0.03573497)
         self.assertEqual(f.qx_data[36863],0.2908819)
-        self.assertEqual(f.Q_unit, '1/A')
-        self.assertEqual(f.I_unit, '1/cm')
+        self.assertEqual(f.Q_unit, 'A^{-1}')
+        self.assertEqual(f.I_unit, 'cm^{-1}')
 
         self.assertEqual(f.meta_data['loader'],"IGOR/DAT 2D Q_map")