Changeset 2ca5d57b in sasview for test

Timestamp:

Sep 13, 2018 11:33:22 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:

feec1cb

Parents:

4fdcc65

Message:

Code cleanup and additional unit tests.

Location:

test/sasdataloader/test

Files:

• test_data/MAR07232_rest.h5 (modified) (previous)
• utest_cansas.py (modified) (3 diffs)

test/sasdataloader/test/utest_cansas.py

@@ -256 +256 @@
         self.datafile_basic = find("simpleexamplefile.h5")
         self.datafile_multiplesasentry = find(
+            "test_data//nxcansas_1Dand2D_multisasentry.h5")
+        self.datafile_multiplesasdata = 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")
@@ -277 +277 @@
             self._check_1d_data(self.data[1])
             self._check_2d_data(self.data[0])
+
+    def test_multiple_sasdatas(self):
+        self.data = self.loader.load(self.datafile_multiplesasdata)
+        self.assertTrue(len(self.data) == 2)
+        self._check_multiple_data(self.data[0])
+        self._check_multiple_data(self.data[1])
+        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 test_multiple_sasentries_multiplesasdatas(self):
+        self.data = self.loader.load(
+            self.datafile_multiplesasdata_multiplesasentry)
+        self.assertTrue(len(self.data) == 4)
+        self._check_multiple_data(self.data[0])
+        self._check_multiple_data(self.data[1])
+        self._check_multiple_data(self.data[2])
+        self._check_multiple_data(self.data[3])
+        for data in self.data:
+            if isinstance(data, Data1D):
+                self._check_1d_data(data)
+            else:
+                self._check_2d_data(data)
 
     def _check_multiple_data(self, data):
@@ -305 +331 @@
         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.data[10], 0.465181)
         self.assertAlmostEqual(data.qx_data[10], -0.129)
         self.assertAlmostEqual(data.qy_data[10], -0.149)