Changes in / [dcd534e:79c9ce5] in sasview
- Location:
- src/sas/sascalc/dataloader
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/dataloader/file_reader_base_class.py
r814ee32 rcb11a25 56 56 :param filepath: The full or relative path to a file to be loaded 57 57 """ 58 self.filepath = filepath59 58 if os.path.isfile(filepath): 60 59 basename, extension = os.path.splitext(os.path.basename(filepath)) -
src/sas/sascalc/dataloader/readers/sesans_reader.py
r814ee32 r849094a 12 12 from ..file_reader_base_class import FileReader 13 13 from ..data_info import plottable_1D, DataInfo 14 from ..loader_exceptions import FileContentsException 14 from ..loader_exceptions import FileContentsException, DataReaderException 15 15 16 16 # Check whether we have a converter available … … 18 18 try: 19 19 from sas.sascalc.data_util.nxsunit import Converter 20 except ImportError:20 except: 21 21 has_converter = False 22 22 _ZERO = 1e-16 … … 46 46 line = self.nextline() 47 47 params = {} 48 while line andnot line.startswith("BEGIN_DATA"):48 while not line.startswith("BEGIN_DATA"): 49 49 terms = line.split() 50 50 if len(terms) >= 2: … … 63 63 raise FileContentsException("Wavelength has no units") 64 64 if params["SpinEchoLength_unit"] != params["Wavelength_unit"]: 65 raise FileContentsException( 66 "The spin echo data has rudely used " 67 "different units for the spin echo length " 68 "and the wavelength. While sasview could " 69 "handle this instance, it is a violation " 70 "of the file format and will not be " 71 "handled by other software.") 65 raise FileContentsException("The spin echo data has rudely used " 66 "different units for the spin echo length " 67 "and the wavelength. While sasview could " 68 "handle this instance, it is a violation " 69 "of the file format and will not be " 70 "handled by other software.") 72 71 73 72 headers = self.nextline().split() … … 87 86 88 87 if not data.size: 89 raise FileContentsException("{} is empty".format( self.filepath))88 raise FileContentsException("{} is empty".format(path)) 90 89 x = data[:, headers.index("SpinEchoLength")] 91 90 if "SpinEchoLength_error" in headers:
Note: See TracChangeset
for help on using the changeset viewer.