Changeset 8ffafd1 in sasview for src/sas/sascalc

Timestamp:

Apr 17, 2017 3:16:39 PM (8 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

da8bb53

Parents:

b09095a

git-author:

Jeff Krzywon <krzywon@…> (04/17/17 15:16:39)

git-committer:

krzywon <krzywon@…> (04/17/17 15:16:39)

Message:

Fix indexing issue that broke unit tests.

File:

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

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

@@ -85 +85 @@
                     self.reset_data_list(len(lines) - line_no)
 
-                candidate_lines += 1
-                # If 5 or more lines, this is considering the set data
-                if candidate_lines >= self.min_data_pts:
-                    is_data = True
-
-                self.current_dataset.x[candidate_lines - 1] = float(toks[0])
-                self.current_dataset.y[candidate_lines - 1] = float(toks[1])
+                self.current_dataset.x[candidate_lines] = float(toks[0])
+                self.current_dataset.y[candidate_lines] = float(toks[1])
 
                 # If a 3rd row is present, consider it dy
                 if new_lentoks > 2:
-                    self.current_dataset.dy[candidate_lines - 1] = \
+                    self.current_dataset.dy[candidate_lines] = \
                         float(toks[2])
                     has_error_dy = True
@@ -101 +96 @@
                 # If a 4th row is present, consider it dx
                 if new_lentoks > 3:
-                    self.current_dataset.dx[candidate_lines - 1] = \
+                    self.current_dataset.dx[candidate_lines] = \
                         float(toks[3])
                     has_error_dx = True
+
+                candidate_lines += 1
+                # If 5 or more lines, this is considering the set data
+                if candidate_lines >= self.min_data_pts:
+                    is_data = True
 
                 # To remember the # of columns on the current line
@@ -143 +143 @@
         if len(self.current_dataset.x) < 1:
             raise RuntimeError("ascii_reader: could not load file")
-            return None
 
         # Data
-        self.current_dataset.x = \
-            self.current_dataset.x[self.current_dataset.x != 0]
-        self.current_dataset.y = \
-            self.current_dataset.y[self.current_dataset.x != 0]
-        self.current_dataset.dy = \
-            self.current_dataset.dy[self.current_dataset.x != 0] if \
-                has_error_dy else np.zeros(len(self.current_dataset.y))
-        self.current_dataset.dx = \
-            self.current_dataset.dx[self.current_dataset.x != 0] if \
-                has_error_dx else np.zeros(len(self.current_dataset.x))
+        x = self.current_dataset.x
+        self.current_dataset.x = self.current_dataset.x[x != 0]
+        self.current_dataset.y = self.current_dataset.y[x != 0]
+        self.current_dataset.dy = self.current_dataset.dy[x != 0] if \
+            has_error_dy else np.zeros(len(self.current_dataset.y))
+        self.current_dataset.dx = self.current_dataset.dx[x != 0] if \
+            has_error_dx else np.zeros(len(self.current_dataset.x))
 
         self.current_dataset.xaxis("\\rm{Q}", 'A^{-1}')