Changeset b65ae90 in sasview

Timestamp:

Apr 1, 2014 6:22:22 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:

b099388

Parents:

d0ac63f

Message:

Fixed the issue with error handling in the cansas reader.

Files:

• src/sans/dataloader/readers/cansas_reader.py (modified) (3 diffs)
• test/sansdataloader/test/utest_abs_reader.py (modified) (1 diff)

src/sans/dataloader/readers/cansas_reader.py

@@ -305 +305 @@
                             return
                         except:
-                            err_msg = "error occured"
+                            err_msg = "CanSAS reader: could not convert the units"
+                            self.errors.append(err_msg)
                             return
                     else:
@@ -414 +415 @@
                                             or node_value.lower() == "nan":
                         node_value = "0.0"
-                    try:
-                        node_value, unit = self._unit_conversion(\
+                    node_value, unit = self._unit_conversion(\
                                 cs_values.current_level, attr, data1d, \
                                 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)
@@ -463 +461 @@
                         except AttributeError as e:
                             pass
-                            
-                     
+            
+            except TypeError:
+                pass
             except Exception as e:
                 exc_type, exc_obj, exc_tb = sys.exc_info()

test/sansdataloader/test/utest_abs_reader.py

@@ -350 +350 @@
         
         self.assertEqual(self.data.meta_data['loader'], "CanSAS 1D")
-        self.assertEqual(len(self.data.errors), 0)
+        self.assertEqual(len(self.data.errors), 1)