Changeset a40e913 in sasview for test/sasdataloader

Timestamp:

Jan 11, 2018 6:29:18 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

8cc9048, 6eb02a5

Parents:

2bdf61a (diff), a58b5a0 (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.

git-author:

Paul Butler <butlerpd@…> (01/11/18 06:29:18)

git-committer:

GitHub <noreply@…> (01/11/18 06:29:18)

Message:

Merge pull request #135 from SasView?/ticket-1037

Ticket 1037: Remove nan values from 1D and 2D data objects

closes #1037

Location:

test/sasdataloader/test

Files:

• nans_in_1d_data.dat (added)
• nans_in_2d_data.DAT (added)
• utest_ascii.py (modified) (2 diffs)
• sam14_cor.ABS (added)
• sam14_cor.cor (added)
• utest_abs_reader.py (modified) (1 diff)

test/sasdataloader/test/utest_ascii.py

@@ -5 +5 @@
 import os.path
 import warnings
+import math
 warnings.simplefilter("ignore")
 
@@ -110 +111 @@
             self.assertEqual(f, None)
 
+    def test_nan_values(self):
+        """
+        Test loading an ascii data file with nan values saved in x, y, or dy.
+        """
+        f_1d = self.loader.load(find("nans_in_1d_data.dat"))[0]
+        f_2d = self.loader.load(find("nans_in_2d_data.DAT"))[0]
+        for i in range(0, len(f_1d.x) - 1):
+            self.assertFalse(math.isnan(f_1d.x[i]))
+            self.assertFalse(math.isnan(f_1d.y[i]))
+            self.assertFalse(math.isnan(f_1d.dy[i]))
+        f_2d.data = f_2d.data.flatten()
+        f_2d.qx_data = f_2d.qx_data.flatten()
+        f_2d.qy_data = f_2d.qy_data.flatten()
+        for i in range(0, len(f_2d.data) - 1):
+            self.assertFalse(math.isnan(f_2d.data[i]))
+            self.assertFalse(math.isnan(f_2d.qx_data[i]))
+            self.assertFalse(math.isnan(f_2d.qy_data[i]))
+
+
 if __name__ == '__main__':
     unittest.main()

test/sasdataloader/test/utest_abs_reader.py

@@ -75 +75 @@
         data = Loader().load(find("jan08002.ABS"))
         self.assertEqual(data[0].meta_data['loader'], "IGOR 1D")
+
+    def test_usans_negative_dxl(self):
+        data_abs = Loader().load(find("sam14_cor.ABS"))
+        data_cor = Loader().load(find("sam14_cor.cor"))
+        for i in range(0, len(data_abs) - 1):
+            self.assertEquals(data_abs.x[i], data_cor.x[i])
+            self.assertEquals(data_abs.y[i], data_cor.y[i])
+            self.assertEquals(data_abs.dxl[i], data_cor.dxl[i])
+            self.assertEquals(data_abs.dxw[i], data_cor.dxw[i])
+            self.assertTrue(data_abs.dxl > 0)
+
 
 class DanseReaderTests(unittest.TestCase):