Changeset 20b6760 in sasview

Timestamp:

Mar 12, 2010 12:55:46 PM (15 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:

83195f7

Parents:

78cae5a

Message:

Added qx qy data as 2D input parameters

Location:

guiframe

Files:

• dataFitting.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter2D.py (modified) (2 diffs)

guiframe/dataFitting.py

@@ -74 +74 @@
                             ymin=ymin, ymax=ymax)
         
-        LoadData2D.__init__(self,data=image, err_data=err_image)
+        LoadData2D.__init__(self,data=image, err_data=err_image, qx_data=None,qy_data=None,q_data=None,mask=None)
         
     def copy_from_datainfo(self, data2d):
@@ -81 +81 @@
         """
         self.data     =  copy.deepcopy(data2d.data)
+        self.qx_data     =  copy.deepcopy(data2d.qx_data)
+        self.qy_data     =  copy.deepcopy(data2d.qy_data)
+        self.q_data     =  copy.deepcopy(data2d.q_data)
+        self.mask     =  copy.deepcopy(data2d.mask)
         self.err_data =  copy.deepcopy(data2d.err_data)
         self.x_bins     = copy.deepcopy(data2d.x_bins)

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -148 +148 @@
             self.plots[event.plot.name].ymax = event.plot.ymax
             self.plots[event.plot.name].data = event.plot.data
+            self.plots[event.plot.name].qx_data = event.plot.qx_data
+            self.plots[event.plot.name].qy_data = event.plot.qy_data
             self.plots[event.plot.name].err_data = event.plot.err_data
             # update qmax with the new xmax of data plotted
@@ -297 +299 @@
         ## Redraw the current image
         self.image(data= self.data2D.data,
+                   qx_data=self.data2D.qx_data,
+                   qy_data=self.data2D.qy_data,
                    xmin= self.data2D.xmin,
                    xmax= self.data2D.xmax,