Changeset a9e1739 in sasview for sansguiframe

Timestamp:

Jun 14, 2012 11:27:24 AM (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:

965264a

Parents:

483c4cf

Message:

trying another shot for the test

File:

• sansguiframe/src/sans/guiframe/dataFitting.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/dataFitting.py

@@ -371 +371 @@
         
         """
-        length = numpy.size(self.data)
-        if length < 1:
-            length = numpy.size(other.data)
-        print "numpy.size(self.data)=", numpy.size(self.data)
         # First, check the data compatibility
         dy, dy_other = self._validity_check(other)
@@ -380 +376 @@
                          q_data=None, err_image=None, xmin=None, xmax=None,
                          ymin=None, ymax=None, zmin=None, zmax=None)
-        result.clone_without_data(length, self)
+        result.clone_without_data(length=numpy.size(self.data), clone=self)
         result.copy_from_datainfo(data2d=self)
+        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.qx_data = self.qx_data
-        result.qy_data = self.qy_data
-        result.q_data = self.q_data
-        result.mask = self.mask
+            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]
-            
             a = Uncertainty(self.data[i], dy[i]**2)
             if isinstance(other, Data2D):
@@ -428 +423 @@
             result.data[i] = output.x
             result.err_data[i] = math.sqrt(math.fabs(output.variance))
+            
         return result