Changeset 9c500ab in sasview for src/sas/sasgui/perspectives/file_converter/otoko_loader.py

Timestamp:

Aug 9, 2016 6:23:08 AM (8 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.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

dc8a553

Parents:

b7c21a7

Message:

Add more descriptive error messages

File:

• src/sas/sasgui/perspectives/file_converter/otoko_loader.py (modified) (4 diffs)

src/sas/sasgui/perspectives/file_converter/otoko_loader.py

@@ -1 +1 @@
 """
 Here we handle loading of "OTOKO" data (for more info about this format see
-the comment in load_bsl_data).  Given the paths of header and data files, we
+the comment in load_otoko_data).  Given the paths of header and data files, we
 aim to load the data into numpy arrays for use later.
 """
@@ -29 +29 @@
         self.data_path = data_path
 
-    def load_bsl_data(self):
+    def load_otoko_data(self):
         """
         Loads "OTOKO" data, which is a format that stores each axis separately.
@@ -42 +42 @@
         http://www.diamond.ac.uk/Home/Beamlines/small-angle/SAXS-Software/CCP13/
         XOTOKO.html
-
-        The BSL format, which is based on OTOKO, is also supported.  Find out more
-        about the BSL format at http://www.diamond.ac.uk/Home/Beamlines/small-angle
-        /SAXS-Software/CCP13/BSL.html.
         """
-        q_axis    = self._load_bsl_axis(self.qaxis_path)
-        data_axis = self._load_bsl_axis(self.data_path)
+        q_axis    = self._load_otoko_axis(self.qaxis_path)
+        data_axis = self._load_otoko_axis(self.data_path)
 
         return OTOKOData(q_axis, data_axis)
 
-    def _load_bsl_axis(self, header_path):
+    def _load_otoko_axis(self, header_path):
         """
         Loads an "OTOKO" axis, given the header file path.  Essentially, the
@@ -107 +103 @@
                     last_file  = int(indicators[9]) == 0 # We don't use this.
                 )
+                if binary_file_info.dimensions != 1:
+                    msg = "File {} has {} dimensions, expected 1. Is it a BSL file?"
+                    raise OTOKOParsingError(msg.format(filename.strip(),
+                        binary_file_info.dimensions))
+
                 binary_file_info_list.append(binary_file_info)