Changeset 9c500ab in sasview for src/sas/sascalc/file_converter

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/sascalc/file_converter/bsl_loader.py (modified) (4 diffs)

src/sas/sascalc/file_converter/bsl_loader.py

@@ -4 +4 @@
 import numpy as np
 
+class BSLParsingError(Exception):
+    pass
+
 class BSLLoader(CLoader):
+    """
+    Loads 2D SAS data from a BSL file.
+    CLoader is a C extension (found in c_ext/bsl_loader.c)
 
-    # TODO: Change to __init__(self, filename, frame)
-    # and parse n_(pixels/rasters) from header file
+    See http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/SAXS-Software/CCP13/BSL.html
+    for more info on the BSL file format.
+    """
+
     def __init__(self, filename):
+        """
+        Parses the BSL header file and sets instance variables apropriately
+
+        :param filename: Path to the BSL header file
+        """
         header_file = open(filename, 'r')
         data_info = {}
@@ -15 +28 @@
 
         [folder, filename] = os.path.split(filename)
+        # SAS data will be in file Xnn001.mdd
+        sasdata_filename = filename.replace('000.', '001.')
+        if sasdata_filename == filename:
+            err_msg = ("Invalid header filename {}.\n Should be of the format "
+                "Xnn000.XXX where X is any alphanumeric character and n is any"
+                " digit.").format(filename)
+            raise BSLParsingError(err_msg)
 
         # First 2 lines are headers
@@ -29 +49 @@
                 err_msg = "Invalid header file: {}".format(filename)
                 break
-            # SAS data will be in file Xnn001.mdd
-            if data_filename != filename.replace('0.', '1.'):
+
+            if data_filename != sasdata_filename:
+                last_file = (metadata[9] == '0')
+                if last_file: # Reached last file we have metadata for
+                    is_valid = False
+                    err_msg = "No metadata for {} found in header file: {}"
+                    err_msg = err_msg.format(sasdata_filename, filename)
+                    break
                 continue
             try:
@@ -43 +69 @@
                 is_valid = False
                 err_msg = "Invalid metadata in header file for {}"
-                err_msg = err_msg.format(filename.replace('0.', '1.'))
+                err_msg = err_msg.format(sasdata_filename)
             break
 
         if not is_valid:
-            raise Exception(err_msg)
-
-        if data_info['frames'] == 1:
-            # File is actually in OTOKO (1D) format
-            # Number of frames is 2nd indicator,
-            data_info['frames'] = data_info['rasters']
-            data_info['rasters'] = data_info['pixels']
-            data_info['pixels'] = 1
+            raise BSLParsingError(err_msg)
 
         CLoader.__init__(self, data_info['filename'], data_info['frames'],