Changeset 3053a4a in sasview

Timestamp:

Dec 5, 2017 12:29:37 PM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

f53d684

Parents:

79c9ce5

git-author:

Paul Kienzle <pkienzle@…> (12/05/17 12:29:37)

git-committer:

GitHub <noreply@…> (12/05/17 12:29:37)

Message:

remove infinite loop from sesans reader (#129)

Location:

src/sas/sascalc/dataloader

Files:

• file_reader_base_class.py (modified) (3 diffs)
• readers/sesans_reader.py (modified) (5 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -47 +47 @@
         # Current DataInfo object being loaded in
         self.current_datainfo = None
+        # File path sent to reader
+        self.filepath = None
         # Open file handle
         self.f_open = None
@@ -56 +58 @@
         :param filepath: The full or relative path to a file to be loaded
         """
+        self.filepath = filepath
         if os.path.isfile(filepath):
             basename, extension = os.path.splitext(os.path.basename(filepath))
@@ -98 +101 @@
         self.current_datainfo = None
         self.current_dataset = None
+        self.filepath = None
         self.output = []
 

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

@@ -12 +12 @@
 from ..file_reader_base_class import FileReader
 from ..data_info import plottable_1D, DataInfo
-from ..loader_exceptions import FileContentsException, DataReaderException
+from ..loader_exceptions import FileContentsException
 
 # Check whether we have a converter available
@@ -18 +18 @@
 try:
     from sas.sascalc.data_util.nxsunit import Converter
-except:
+except ImportError:
     has_converter = False
 _ZERO = 1e-16
@@ -46 +46 @@
         line = self.nextline()
         params = {}
-        while not line.startswith("BEGIN_DATA"):
+        while line and not line.startswith("BEGIN_DATA"):
             terms = line.split()
             if len(terms) >= 2:
@@ -63 +63 @@
             raise FileContentsException("Wavelength has no units")
         if params["SpinEchoLength_unit"] != params["Wavelength_unit"]:
-            raise FileContentsException("The spin echo data has rudely used "
-                               "different units for the spin echo length "
-                               "and the wavelength.  While sasview could "
-                               "handle this instance, it is a violation "
-                               "of the file format and will not be "
-                               "handled by other software.")
+            raise FileContentsException(
+                "The spin echo data has rudely used "
+                "different units for the spin echo length "
+                "and the wavelength.  While sasview could "
+                "handle this instance, it is a violation "
+                "of the file format and will not be "
+                "handled by other software.")
 
         headers = self.nextline().split()
@@ -86 +87 @@
 
         if not data.size:
-            raise FileContentsException("{} is empty".format(path))
+            raise FileContentsException("{} is empty".format(self.filepath))
         x = data[:, headers.index("SpinEchoLength")]
         if "SpinEchoLength_error" in headers: