Changeset d96744de in sasview

Timestamp:

Dec 21, 2018 8:34:39 AM (6 years ago)

Author:

Jeff Krzywon <jkrzywon@…>

Branches:

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

Children:

1342f6a

Parents:

109afbd

Message:

Fix for loading USANS data in ABS reader including fixes to unit tests.

Files:

• src/sas/sascalc/dataloader/readers/abs_reader.py (modified) (3 diffs)
• test/sasdataloader/test/sam14_cor.txt (moved) (moved from test/sasdataloader/test/sam14_cor.cor)
• test/sasdataloader/test/utest_abs_reader.py (modified) (1 diff)

src/sas/sascalc/dataloader/readers/abs_reader.py

@@ -48 +48 @@
         detector = Detector()
         data_line = 0
+        x_index = 4
         self.reset_data_list(len(lines))
         self.current_datainfo.detector.append(detector)
@@ -63 +64 @@
         for line in lines:
             # Information line 1
+            if line.find(".bt5") > 0:
+                x_index = 0
             if is_info:
                 is_info = False
@@ -171 +174 @@
 
                 try:
-                    _x = float(toks[4])
+                    _x = float(toks[x_index])
                     _y = float(toks[1])
                     _dy = float(toks[2])

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):
+        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.dxl[i])
-            self.assertEqual(data_abs.dxw[i], data_cor.dxw[i])
-            self.assertTrue(data_abs.dxl > 0)
+            self.assertEqual(data_abs.dxl[i], -data_cor.dx[i])
+            self.assertTrue(data_abs.dxl[i] > 0)