Changeset 3b909b7 in sasview

Timestamp:

Feb 12, 2009 2:09:16 PM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

ef8b580

Parents:

31e3298

Message:

allow annulus to plot no matter the order of the circle
boxslicer draw given data boundaries

Location:

guiframe/local_perspectives/plotting

Files:

• AnnulusSlicer.py (modified) (1 diff)
• boxSlicer.py (modified) (1 diff)
• boxSum.py (modified) (1 diff)

guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -117 +117 @@
         
         from DataLoader.manipulations import SectorPhi
-        radius = self.qmax#math.sqrt(math.pow(self.qmax,2)+math.pow(self.qmax,2))
-        rmin= math.fabs(self.inner_circle.get_radius())
-        rmax = math.fabs(self.outer_circle.get_radius())
-        phi_min=-math.pi
-        phi_max=math.pi
-        phimi=phi_min+math.pi
-        phima=phi_max+math.pi
-        sect = SectorPhi(r_min=rmin , r_max= rmax, phi_min=phimi, phi_max=phima)
+        #radius = self.qmax#math.sqrt(math.pow(self.qmax,2)+math.pow(self.qmax,2))
+        rmin= min(math.fabs(self.inner_circle.get_radius()),
+                  math.fabs(self.outer_circle.get_radius()))
+        rmax = max(math.fabs(self.inner_circle.get_radius()),
+                   math.fabs(self.outer_circle.get_radius()))
+        print "rmin, rmax", rmin, rmax
+       
+        sect = SectorPhi(r_min=rmin , r_max= rmax, phi_min=0, phi_max=2*math.pi)
         if nbins!=None:
             sect.nbins = nbins

guiframe/local_perspectives/plotting/boxSlicer.py

@@ -30 +30 @@
         self.qmax = self.base.data2D.xmax
         self.connect = self.base.connect
-        self.x= x_max
-        self.y= y_max
-                
+        self.x= 0.5*min(math.fabs(self.base.data2D.xmax),math.fabs( self.base.data2D.xmin))
+        self.y= 0.5*min(math.fabs(self.base.data2D.xmax),math.fabs( self.base.data2D.xmin))        
+         
         self.theta2= math.pi/3
         ## Number of points on the plot

guiframe/local_perspectives/plotting/boxSum.py

@@ -156 +156 @@
         y_min= self.vertical_lines.y2
         y_max= self.vertical_lines.y1
+        print "xmin, xmax, ymin , ymax", x_min, x_max, y_min, y_max
         box =  Boxavg (x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max)
         self.count, self.error = box(self.base.data2D)
-        #print "count, error",self.count, self.error
+        print "box_sum output",box(self.base.data2D)
                           
     def moveend(self, ev):