Changeset c080e542 in sasview

Timestamp:

Jan 23, 2013 12:22:32 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:

9e9e9a5

Parents:

a30864b1

Message:

minor fixes in 2d image get_bin

File:

• plottools/src/danse/common/plottools/PlotPanel.py (modified) (2 diffs)

plottools/src/danse/common/plottools/PlotPanel.py

@@ -1628 +1628 @@
         
         # find max and min values of qx and qy
-        xmax = numpy.max(self.qx_data)
-        xmin = numpy.min(self.qx_data)
-        ymax = numpy.max(self.qy_data)
-        ymin = numpy.min(self.qy_data)
+        xmax = self.qx_data.max()
+        xmin = self.qx_data.min()
+        ymax = self.qy_data.max()
+        ymin = self.qy_data.min()
         
         # calculate the range of qx and qy: this way, it is a little
@@ -1647 +1647 @@
 
         # max and min taking account of the bin sizes
-        xmax = xmax + xstep / 2
-        xmin = xmin - xstep / 2
-        ymax = ymax + ystep / 2
-        ymin = ymin - ystep / 2
+        xmax = xmax + xstep / 2.0
+        xmin = xmin - xstep / 2.0
+        ymax = ymax + ystep / 2.0
+        ymin = ymin - ystep / 2.0
         
         # store x and y bin centers in q space
-        x_bins = numpy.arange(xmin, xmax + xstep / 10, xstep)
-        y_bins = numpy.arange(ymin, ymax + ystep / 10, ystep)
+        x_bins = numpy.linspace(xmin, xmax, npix_x)
+        y_bins = numpy.linspace(ymin, ymax, npix_y)
+        #x_bins = numpy.arange(xmin, xmax + xstep / 10.0, xstep)
+        #y_bins = numpy.arange(ymin, ymax + ystep / 10.0, ystep)
       
         #set x_bins and y_bins