Changeset dcd6efd in sasview for test/sasdataloader/test/utest_abs_reader.py

Timestamp:

Jan 2, 2019 1:57:45 PM (5 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

Children:

ef74a8b, a13c41b, 462e019

Parents:

cb9640f (diff), d96744de (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/02/19 13:57:45)

git-committer:

GitHub <noreply@…> (01/02/19 13:57:45)

Message:

Merge pull request #180 from SasView?/ticket-1111

Multiple data loader and writer updates - NXcanSAS compliance, data conversion, saving as NXcanSAS, plus more

Fixes #976
Fixes #1129
Fixes #1111
Fixes #1221

File:

• test/sasdataloader/test/utest_abs_reader.py (modified) (2 diffs)

test/sasdataloader/test/utest_abs_reader.py

@@ -77 +77 @@
 
     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)
+        data_abs = Loader().load(find("sam14_cor.ABS"))[0]
+        data_cor = Loader().load(find("sam14_cor.txt"))[0]
+        for i in range(0, len(data_abs.x) - 1):
+            self.assertEqual(data_abs.x[i], data_cor.x[i])
+            self.assertEqual(data_abs.y[i], data_cor.y[i])
+            self.assertEqual(data_abs.dxl[i], -data_cor.dx[i])
+            self.assertTrue(data_abs.dxl[i] > 0)
 
 
@@ -118 +117 @@
         self.assertEqual(self.data.detector[0].beam_center.y, center_y)
 
-        self.assertEqual(self.data.I_unit, '1/cm')
+        self.assertEqual(self.data.I_unit, 'cm^{-1}')
         self.assertEqual(self.data.data[0], 1.57831)
         self.assertEqual(self.data.data[1], 2.70983)