Changeset fd224fd in sasview

Timestamp:

Apr 25, 2011 12:20:01 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

2e3f9e3

Parents:

d09fa370

Message:

ignore "count' unit replace it with 1/cm

File:

• DataLoader/readers/cansas_reader.py (modified) (2 diffs)

DataLoader/readers/cansas_reader.py

@@ -515 +515 @@
                         _y = data_conv_i(_y, units=data_info.y_unit)
                     except:
-                        msg = "CanSAS reader: could not convert I(q) unit [%s];"
-                        msg += " expecting [%s]\n  %s" % (attr['unit'], 
-                                            data_info.y_unit, sys.exc_value)
-                        raise ValueError, msg
+                        if attr['unit'].lower() == 'count':
+                            pass
+                        else:
+                            msg = "CanSAS reader: could not"
+                            msg += " convert I(q) unit [%s];" % str(attr['unit'])
+                            msg += " expecting [%s]\n" % str(data_info.y_unit)
+                            msg += "  %s" % str(sys.exc_value)
+                            raise ValueError, msg
                 else:
                     msg = "CanSAS reader: unrecognized I(q) unit [%s];"
@@ -531 +535 @@
                         _dy = data_conv_i(_dy, units=data_info.y_unit)
                     except:
-                        msg = "CanSAS reader: could not convert dI(q) unit "
-                        msg += "[%s]; expecting [%s]\n  %s"  % (attr_d['unit'],
-                                             data_info.y_unit, sys.exc_value)
-                        raise ValueError, msg
+                        if attr_d['unit'].lower() == 'count':
+                            pass 
+                        else:
+                            msg = "CanSAS reader: could not convert dI(q) unit "
+                            msg += "[%s]; expecting [%s]\n  %s"  % (attr_d['unit'],
+                                                 data_info.y_unit, sys.exc_value)
+                            raise ValueError, msg
                 else:
                     msg = "CanSAS reader: unrecognized dI(q) unit [%s]; "