Changeset 92c8fec in sasview

Timestamp:

Apr 1, 2014 5:26:38 AM (11 years ago)

Author:

Jeff Krzywon <jeffery.krzywon@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d0ac63f

Parents:

d7b46e71

Message:

Better error handling when loading cansas data with improper units.

File:

• src/sans/dataloader/readers/cansas_reader.py (modified) (5 diffs)

src/sans/dataloader/readers/cansas_reader.py

@@ -265 +265 @@
     
     def _unit_conversion(self, new_current_level, attr, data1d, \
-                                    node_value, optional = True):
+                                    tagname, node_value, optional = True):
         """
         A unit converter method used to convert the data included in the file
@@ -291 +291 @@
                     if HAS_CONVERTER == True:
                         try:
+                            ## Check local units - bad units should raise KeyError
+                            Converter(local_unit)
                             data_conv_q = Converter(attr['unit'])
                             value_unit = default_unit
                             exec "node_value = data_conv_q(node_value, units=data1d.{0})".format(unitname)
-                        except:
+                        except KeyError as e:
                             err_msg = "CanSAS reader: could not convert "
-                            err_msg += "Q unit {0}; ".format(local_unit)
+                            err_msg += "{0} unit {1}; ".format(tagname, local_unit)
                             intermediate = "err_msg += \"expecting [{1}]  {2}\".format(data1d.{0}, sys.exc_info()[1])".format(unitname, "{0}", "{1}")
                             exec intermediate
                             self.errors.append(err_msg)
-                            if optional:
-                                logging.info(err_msg)
-                            else:
-                                raise ValueError, err_msg
+                            raise ValueError(err_msg)
+                            return
+                        except:
+                            err_msg = "error occured"
+                            return
                     else:
                         value_unit = local_unit
@@ -310 +313 @@
                         err_msg += " expecting [%s]" % local_unit
                         self.errors.append(err_msg)
-                        if optional:
-                            logging.info(err_msg)
-                        else:
-                            raise ValueError, err_msg
+                        raise ValueError, err_msg
+                        return
                 else:
                     value_unit = local_unit
@@ -321 +322 @@
                 exec "err_msg += \"expecting [%s]\n  %s\" % (data1d.{0}, sys.exc_info()[1])".format(unitname)
                 self.errors.append(err_msg)
-                if optional:
-                    logging.info(err_msg)
-                else:
-                    raise ValueError, err_msg
+                raise ValueError, err_msg
+                return
         elif 'unit' in attr:
             value_unit = attr['unit']
@@ -415 +414 @@
                                             or node_value.lower() == "nan":
                         node_value = "0.0"
-                    node_value, unit = self._unit_conversion(\
+                    try:
+                        node_value, unit = self._unit_conversion(\
                                 cs_values.current_level, attr, data1d, \
-                                node_value, cs_values.ns_optional)
+                                tagname, node_value, cs_values.ns_optional)
+                    except TypeError:
+                        print "TypeError with units of {0} and node of {1}".format(attr['unit'], tagname)
                     
                 # If appending to a dictionary (meta_data | run_name)