Changeset da8bb53 in sasview for src/sas/sascalc/dataloader/readers

Timestamp:

Apr 17, 2017 4:30:10 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:

ad92c5a

Parents:

8ffafd1

git-author:

Jeff Krzywon <krzywon@…> (04/17/17 16:30:10)

git-committer:

krzywon <krzywon@…> (04/17/17 16:30:10)

Message:

Added a 4th data loader exception for generic readers that cannot open file.

File:

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

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

@@ -17 +17 @@
 from sas.sascalc.dataloader.file_reader_base_class import FileReader
 from sas.sascalc.dataloader.data_info import DataInfo, plottable_1D
+from sas.sascalc.dataloader.loader_exceptions import FileContentsException,\
+    DefaultReaderException
 
 logger = logging.getLogger(__name__)
@@ -110 +112 @@
                 line_no += 1
             except ValueError:
+                # ValueError is raised when non numeric strings conv. to float
                 # It is data and meet non - number, then stop reading
                 if is_data:
@@ -121 +124 @@
                 # Reset # of lines of data candidates
                 candidate_lines = 0
-            except Exception:
-                # Handle any unexpected exceptions
-                raise
 
         if not is_data:
-            # TODO: Check file extension - primary reader, throw error.
-            # TODO: Secondary check, pass and try next reader
-            msg = "ascii_reader: x has no data"
-            raise RuntimeError(msg)
+            self.set_all_to_none()
+            if self.extension in self.ext:
+                msg = "ASCII Reader error: Fewer than five Q data points found "
+                msg += "in {}.".format(filepath)
+                raise FileContentsException(msg)
+            else:
+                msg = "ASCII Reader could not load the file {}".format(filepath)
+                raise DefaultReaderException(msg)
         # Sanity check
         if has_error_dy and not len(self.current_dataset.y) == \
                 len(self.current_dataset.dy):
-            msg = "ascii_reader: y and dy have different length"
-            raise RuntimeError(msg)
+            msg = "ASCII Reader error: Number of I and dI data points are"
+            msg += " different in {}.".format(filepath)
+            # TODO: Add error to self.current_datainfo.errors instead?
+            self.set_all_to_none()
+            raise FileContentsException(msg)
         if has_error_dx and not len(self.current_dataset.x) == \
                 len(self.current_dataset.dx):
-            msg = "ascii_reader: y and dy have different length"
-            raise RuntimeError(msg)
-        # If the data length is zero, consider this as
-        # though we were not able to read the file.
-        if len(self.current_dataset.x) < 1:
-            raise RuntimeError("ascii_reader: could not load file")
+            msg = "ASCII Reader error: Number of Q and dQ data points are"
+            msg += " different in {}.".format(filepath)
+            # TODO: Add error to self.current_datainfo.errors instead?
+            self.set_all_to_none()
+            raise FileContentsException(msg)
 
-        # Data
+        # Remove any point where Q == 0
         x = self.current_dataset.x
         self.current_dataset.x = self.current_dataset.x[x != 0]