Changeset c2e5898 in sasview

Timestamp:

Jul 9, 2012 4:33:24 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:

5da3cc5

Parents:

cbba84f

Message:

the data in the grid copied from datainfo can now be in data operation

Files:

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

sansdataloader/src/sans/dataloader/data_info.py

@@ -758 +758 @@
             
             # Here we could also extrapolate between data points
+            ZERO = 1.0e-12
             for i in range(len(self.x)):
-                if self.x[i] != other.x[i]:
+                if math.fabs(self.x[i] - other.x[i]) > ZERO:
                     msg = "Incompatible data sets: x-values do not match"
                     raise ValueError, msg

sansguiframe/src/sans/guiframe/data_processor.py

@@ -1137 +1137 @@
                              StatusEvent(status=msg, info="error")) 
             return
+        if dy == None:
+            dy = numpy.zeros(len(y))
         #plotting
         new_plot = Data1D(x=x, y=y, dy=dy)
         new_plot.id =  wx.NewId()
+        new_plot.is_data = False
         new_plot.group_id = wx.NewId()
         y_title = self.y_axis_title.GetValue()