Changeset d96744de in sasview for src/sas/sascalc

Timestamp:

Dec 21, 2018 10: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.

File:

• src/sas/sascalc/dataloader/readers/abs_reader.py (modified) (3 diffs)

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])