Changeset 0f010c9 in sasview for src/sas/sascalc/file_converter

Timestamp:

Jul 20, 2017 9:50:00 AM (7 years ago)

Author:

lewis

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:

19296dc

Parents:

58a255b

Message:

Catch error when incorrect number of intensity/error points in file

File:

• src/sas/sascalc/file_converter/ascii2d_loader.py (modified) (1 diff)

src/sas/sascalc/file_converter/ascii2d_loader.py

@@ -117 +117 @@
         current_line += 1
 
-        current_line, I = _load_points(all_lines, current_line, width*height)
-        dI = np.zeros(width*height)
+        try:
+            current_line, I = _load_points(all_lines, current_line, width*height)
+            dI = np.zeros(width*height)
 
-        # Load error data if it's provided
-        if iflag == 3:
-            _, dI = _load_points(all_lines, current_line, width*height)
+            # Load error data if it's provided
+            if iflag == 3:
+                _, dI = _load_points(all_lines, current_line, width*height)
+        except Exception as e:
+            err_msg = "File incorrectly formatted.\n"
+            if str(e).find("list index") != -1:
+                err_msg += ("Incorrect number of data points. Expected {} intensity").format(width*height)
+                if iflag == 3:
+                    err_msg += " and error"
+                err_msg += " points."
+            else:
+                err_msg += str(e)
+            raise ValueError(err_msg)
 
         # Format data for use with Data2D