Changeset dcf73a4 in sasview for sansdataloader/src/sans/dataloader/data_info.py

Timestamp:

Jun 14, 2012 1:48:28 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:

72538fc

Parents:

965264a

Message:

hoping this fixed the test…

File:

• sansdataloader/src/sans/dataloader/data_info.py (modified) (3 diffs)

sansdataloader/src/sans/dataloader/data_info.py

@@ -959 +959 @@
             dqx_data = None
             dqy_data = None
-            clone = Data2D(data, err_data, qx_data, qy_data,
-                            q_data, mask, dqx_data=dqx_data, dqy_data=dqy_data)
+            clone = Data2D(data, err_data, qx_data, qy_data, q_data, mask)
 
         clone.title       = self.title
@@ -995 +994 @@
         if isinstance(other, Data2D):
             # Check that data lengths are the same
-            if numpy.size(self.data) != numpy.size(other.data):
+            if len(self.data) != len(other.data) or \
+                len(self.qx_data) != len(other.qx_data) or \
+                len(self.qy_data) != len(other.qy_data):
                 msg = "Unable to perform operation: data length are not equal"
                 raise ValueError, msg
-            if numpy.size(self.qx_data) != numpy.size(other.qx_data):
-                msg = "Unable to perform operation: data length are not equal"
-                raise ValueError, msg
-            if numpy.size(self.qy_data) != numpy.size(other.qy_data):
-                msg = "Unable to perform operation: data length are not equal"
-                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"
-                raise ValueError, msg 
-            elif other.__class__.__name__ == 'ndarray':
-                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
+            #if len(self.data) < 1:
+            #    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
                    
             # Check that the scales match
             err_other = other.err_data
             if other.err_data == None or \
-                (numpy.size(other.err_data) != numpy.size(other.data)):
-                err_other = numpy.zeros(numpy.size(other.data))
+                (len(other.err_data) != len(other.data)):
+                err_other = numpy.zeros(len(other.data))
             
         # Check that we have errors, otherwise create zero vector
         err = self.err_data
         if self.err_data == None or \
-            (numpy.size(self.err_data) != numpy.size(self.data)):
-            err = numpy.zeros(numpy.size(other.data))
+            (len(self.err_data) != len(self.data)):
+            err = numpy.zeros(len(other.data))
             
         return err, err_other
@@ -1045 +1032 @@
         
         """
+        print "numpy.size(self.data)=", numpy.size(self.data)
         # First, check the data compatibility
         dy, dy_other = self._validity_check(other)
         result = self.clone_without_data(numpy.size(self.data))
+        result.data = self.data
+        result.qx_data = self.qx_data
+        result.qy_data = self.qy_data
+        result.q_data = self.q_data
+        result.mask = self.mask
         result.xmin = self.xmin
         result.xmax = self.xmax
         result.ymin = self.ymin
         result.ymax = self.ymax
+        
+        if self.err_data is not None:
+            result.err_data = self.err_data    
+        if self.dqx_data is not None:
+            result.dqx_data = self.dqx_data
+        if self.dqy_data is not None:
+            result.dqy_data = self.dqy_data
         if self.dqx_data == None or self.dqy_data == None:
             result.dqx_data = None
             result.dqy_data = None
         else:
-            result.dqx_data = numpy.zeros(len(self.data))
-            result.dqy_data = numpy.zeros(len(self.data))
+            result.dqx_data = numpy.zeros(numpy.size(self.data))
+            result.dqy_data = numpy.zeros(numpy.size(self.data))
+        
         for i in range(numpy.size(self.data)):
-            result.data[i] = self.data[i]
-            if self.err_data is not None and \
-                numpy.size(self.data) == numpy.size(self.err_data):
-                result.err_data[i] = self.err_data[i]    
-            if self.dqx_data is not None:
-                result.dqx_data[i] = self.dqx_data[i]
-            if self.dqy_data is not None:
-                result.dqy_data[i] = self.dqy_data[i]
-            result.qx_data[i] = self.qx_data[i]
-            result.qy_data[i] = self.qy_data[i]
-            result.q_data[i] = self.q_data[i]
-            result.mask[i] = self.mask[i]
-            
             a = Uncertainty(self.data[i], dy[i]**2)
             if isinstance(other, Data2D):