Changeset d9e59ad in sasview

Timestamp:

Jun 13, 2012 6:13:22 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:

e6f0020

Parents:

365aa1ed

Message:

trying to fix 2d operation tests

File:

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

sansdataloader/src/sans/dataloader/data_info.py

@@ -1008 +1008 @@
                 msg = "Incompatible data sets: I-values do not match"
                 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"
-                    raise ValueError, msg
-                if self.qy_data[ind] != other.qy_data[ind]:
-                    msg = "Incompatible data sets: qy-values do not match"
-                    raise ValueError, msg
+            else:
+                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"
+                        raise ValueError, msg
+                    if self.qy_data[ind] != other.qy_data[ind]:
+                        msg = "Incompatible data sets: qy-values do not match"
+                        raise ValueError, msg
                    
             # Check that the scales match