Changeset f994e8b1 in sasview for src/sas/sascalc

Timestamp:

Aug 2, 2017 6:58:22 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:

3a81cd9

Parents:

f26b7c1

Message:

Display warning when ISIS 2D ASCII data is loaded

File:

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

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

@@ -108 +108 @@
                     is_data = True
 
+                if is_data and new_lentoks >= 8:
+                    msg = "This data looks like 2D ASCII data. Use the file "
+                    msg += "converter tool to convert it to NXcanSAS."
+                    raise FileContentsException(msg)
+
                 # To remember the # of columns on the current line
                 # for the next line of data
@@ -125 +130 @@
                 # Reset # of lines of data candidates
                 candidate_lines = 0
-
+        
         if not is_data:
             self.set_all_to_none()