Changeset 05d3ebe in sasview

Timestamp:

Jun 14, 2012 10:01:38 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:

dd2ab70

Parents:

9ab366a

Message:

trying to figure out test problem

File:

• sansguiframe/src/sans/guiframe/dataFitting.py (modified) (2 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)
@@ -376 +380 @@
                          q_data=None, err_image=None, xmin=None, xmax=None,
                          ymin=None, ymax=None, zmin=None, zmax=None)
-        result.clone_without_data(len(self.data), self)
+        result.clone_without_data(length, self)
         result.copy_from_datainfo(data2d=self)
         result.xmin = self.xmin