Changeset bd365666 in sasview for sansdataloader/src/sans/dataloader

Timestamp:

Jun 4, 2012 12:20:37 PM (12 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:

0320d36

Parents:

8a9f699

Message:

added qx_data, qy_data checking

File:

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

sansdataloader/src/sans/dataloader/data_info.py

@@ -911 +911 @@
                 msg = "Unable to perform operation: data length are not equal"
                 raise ValueError, msg
+            # Here we could also extrapolate between data points
+            if numpy.size(self.data) < 2:
+                msg = "Incompatible data sets: I-values do not match"
+                raise ValueError, msg 
+            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
                    
             # Check that the scales match