Changeset 7f75a3f in sasview for src/sas/sascalc/dataloader/readers/ascii_reader.py

Timestamp:

Apr 5, 2017 9:08:59 AM (7 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:

278ddee

Parents:

69400ec

git-author:

Jeff Krzywon <krzywon@…> (04/05/17 09:08:59)

git-committer:

krzywon <krzywon@…> (04/05/17 09:08:59)

Message:

More explicit error messages when file loading fails. see #889

File:

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

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

@@ -17 +17 @@
 import os
 from sas.sascalc.dataloader.data_info import Data1D
+from sas.sascalc.dataloader.loader_exceptions import FileContentsException
 
 # Check whether we have a converter available
@@ -173 +174 @@
                 if not is_data:
                     msg = "ascii_reader: x has no data"
-                    raise RuntimeError, msg
+                    raise FileContentsException, msg
                 # Sanity check
                 if has_error_dy == True and not len(ty) == len(tdy):
                     msg = "ascii_reader: y and dy have different length"
-                    raise RuntimeError, msg
+                    raise FileContentsException, msg
                 if has_error_dx == True and not len(tx) == len(tdx):
                     msg = "ascii_reader: y and dy have different length"
-                    raise RuntimeError, msg
+                    raise FileContentsException, msg
                 # If the data length is zero, consider this as
                 # though we were not able to read the file.
                 if len(tx) == 0:
-                    raise RuntimeError, "ascii_reader: could not load file"
+                    raise FileContentsException, "ascii_reader: could not load file"
 
                 #Let's re-order the data to make cal.