Changeset 003fa4e in sasview for guiframe/local_perspectives/plotting

Timestamp:

Mar 10, 2011 11:53:16 AM (14 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:

3fafe15

Parents:

ae83ad3

Message:

Added dq in cir. averaging

File:

• guiframe/local_perspectives/plotting/Plotter2D.py (modified) (5 diffs)

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -15 +15 @@
 import os
 import math
+import numpy
 import pylab
 import danse.common.plottools
@@ -220 +221 @@
         slicerpop.Append(id,'&Print Preview', 'image preview for print')
         wx.EVT_MENU(self, id, self.onPrinterPreview)
+
+        id = wx.NewId()
+        slicerpop.Append(id, '&Copy to Clipboard', 'Copy to the clipboard')
+        wx.EVT_MENU(self, id, self.OnCopyFigureMenu)
         
         # saving data
@@ -404 +409 @@
         
         """
+        # Find the best number of bins
+        npt = math.sqrt(len(self.data2D.data[numpy.isfinite(self.data2D.data)]))
+        npt = math.floor(npt)
         from DataLoader.manipulations import CircularAverage
         ## compute the maximum radius of data2D
@@ -412 +420 @@
         self.radius = math.sqrt(math.pow(self.qmax, 2)+ math.pow(self.ymax, 2)) 
         ##Compute beam width
-        bin_width = (self.qmax + self.qmax)/100
+        bin_width = (self.qmax + self.qmax)/npt
         ## Create data1D circular average of data2D
         Circle = CircularAverage(r_min=0, r_max=self.radius, 
@@ -426 +434 @@
         else:
             dxw = None
-        new_plot = Data1D(x=circ.x, y=circ.y, dy=circ.dy)
+
+        new_plot = Data1D(x=circ.x, y=circ.y, dy=circ.dy, dx=circ.dx)
         new_plot.dxl = dxl
         new_plot.dxw = dxw