Changeset db5196d in sasview

Timestamp:

Jan 3, 2018 9:50:17 AM (7 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, ticket885, unittest-saveload

Children:

6fd7b20

Parents:

f02a0c6

Message:

Add unit tests for removal of nans from 2D data. Change test file names for consistency and clarity.

Location:

test/sasdataloader/test

Files:

• nans_in_1d_data.dat (moved) (moved from test/sasdataloader/test/test_data_nan_values.dat)
• nans_in_2d_data.DAT (added)
• utest_ascii.py (modified) (1 diff)

test/sasdataloader/test/utest_ascii.py

@@ -115 +115 @@
         Test loading an ascii data file with nan values saved in x, y, or dy.
         """
-        f = self.loader.load(find("test_data_nan_values.dat"))[0]
-        for i in range(0, len(f.x) - 1):
-            self.assertFalse(math.isnan(f.x[i]))
-            self.assertFalse(math.isnan(f.y[i]))
-            self.assertFalse(math.isnan(f.dy[i]))
+        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]))