Changeset a4d4b35 in sasview

Timestamp:

Mar 12, 2010 10:48:57 AM (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:

08ece0b

Parents:

095ab1b

Message:

fixed slabY bug: binning x-direction

File:

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

guiframe/local_perspectives/plotting/boxSlicer.py

@@ -42 +42 @@
         ## Number of points on the plot
         self.nbins = 30
+        ## If True, I(|Q|) will be return, otherwise, negative q-values are allowed
+        self.fold = True        
         ## reference of the current  Slab averaging
         self.averager=None
@@ -135 +137 @@
         
     
-    def post_data(self,new_slab=None , nbins=None):
+    def post_data(self,new_slab=None , nbins=None, direction =None):
         """
              post data averaging in Qx or Qy given new_slab type
              @param new_slab: slicer that determine with direction to average
              @param nbins: the number of points plotted when averaging
+             @param direction: the direction of averaging
         """
         x_min= -1*math.fabs(self.vertical_lines.x)
@@ -153 +156 @@
                 raise ValueError,"post data:cannot average , averager is empty"
             self.averager= new_slab
-        bin_width= (x_max + math.fabs(x_min))/self.nbins
+        if direction == "X":
+            if self.fold: x_low = 0
+            else: x_low = math.fabs(x_min)
+            bin_width= (x_max + x_low)/self.nbins
+        else:
+            if self.fold: y_low = 0
+            else: y_low = math.fabs(y_min)
+            bin_width= (y_max + y_low)/self.nbins
         ## Average data2D given Qx or Qy
         box = self.averager( x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max,
                          bin_width=bin_width)
-        
+        box.fold = self.fold
         boxavg = box(self.base.data2D)
         #3 Create Data1D to plot
@@ -541 +551 @@
         """
         from DataLoader.manipulations import SlabX
-        self.post_data(SlabX )   
+        self.post_data(SlabX, direction ="X")   
         
 
@@ -559 +569 @@
         """
         from DataLoader.manipulations import SlabY
-        self.post_data(SlabY )   
-        
-        
+        self.post_data(SlabY, direction ="Y")   
+        
+