Changeset 1b1a1c1 in sasview

Timestamp:

Oct 7, 2016 11:28:39 AM (8 years ago)

Author:

mathieu

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:

dd72190

Parents:

286c757

Message:

Add tolerance to data ops. Fixes #493

File:

• src/sas/sascalc/dataloader/data_info.py (modified) (3 diffs)

src/sas/sascalc/dataloader/data_info.py

@@ -881 +881 @@
                 raise ValueError, msg
             # Here we could also extrapolate between data points
-            ZERO = 1.0e-12
+            TOLERANCE = 0.01
             for i in range(len(self.x)):
-                if math.fabs(self.x[i] - other.x[i]) > ZERO:
+                if math.fabs((self.x[i] - other.x[i])/self.x[i]) > TOLERANCE:
                     msg = "Incompatible data sets: x-values do not match"
                     raise ValueError, msg
@@ -1093 +1093 @@
         """
         err_other = None
+        TOLERANCE = 0.01
         if isinstance(other, Data2D):
             # Check that data lengths are the same
@@ -1101 +1102 @@
                 raise ValueError, msg
             for ind in range(len(self.data)):
-                if self.qx_data[ind] != other.qx_data[ind]:
-                    msg = "Incompatible data sets: qx-values do not match"
+                if math.fabs((self.qx_data[ind] - other.qx_data[ind])/self.qx_data[ind]) > TOLERANCE:
+                    msg = "Incompatible data sets: qx-values do not match: %s %s" % (self.qx_data[ind], other.qx_data[ind])
                     raise ValueError, msg
-                if self.qy_data[ind] != other.qy_data[ind]:
-                    msg = "Incompatible data sets: qy-values do not match"
+                if math.fabs((self.qy_data[ind] - other.qy_data[ind])/self.qy_data[ind]) > TOLERANCE:
+                    msg = "Incompatible data sets: qy-values do not match: %s %s" % (self.qy_data[ind], other.qy_data[ind])
                     raise ValueError, msg