Changeset 9ab366a in sasview for sansdataloader

Timestamp:

Jun 13, 2012 7:45:49 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

05d3ebe

Parents:

2bd55e8

Message:

trying to fix tests

File:

• sansdataloader/src/sans/dataloader/data_info.py (modified) (1 diff)

sansdataloader/src/sans/dataloader/data_info.py

@@ -1005 +1005 @@
                 raise ValueError, msg
             # Here we could also extrapolate between data points
+            if self.qx_data.all() != other.qx_data.all():
+                msg = "Incompatible data sets: qx-values do not match"
+                raise ValueError, msg
+            if self.qy_data.all() != other.qy_data.all():
+                msg = "Incompatible data sets: qy-values do not match"
+                raise ValueError, msg
             if numpy.size(self.data) < 2:
                 msg = "Incompatible data sets: I-values do not match"