Changeset 78cae5a in sasview

Timestamp:

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

20b6760

Parents:

08ece0b

Message:

used ring avg instead of sectorphi

Location:

guiframe/local_perspectives/plotting

Files:

• AnnulusSlicer.py (modified) (6 diffs)
• AzimutSlicer.py (modified) (1 diff)

guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -117 +117 @@
             return
         
-        from DataLoader.manipulations import SectorPhi
+        from DataLoader.manipulations import Ring
     
         rmin= min(math.fabs(self.inner_circle.get_radius()),
@@ -130 +130 @@
             self.nbins = nbins
         ## create the data1D Q average of data2D    
-        sect = SectorPhi(r_min=rmin , r_max= rmax,
-                          phi_min=0, phi_max=2*math.pi , nbins=self.nbins)
+        sect = Ring(r_min=rmin , r_max= rmax, nbins=self.nbins)
         sector = sect(self.base.data2D)
         
@@ -144 +143 @@
             dxw= None
        
-        new_plot = Data1D(x=sector.x,y=sector.y,dy=sector.dy)
+        new_plot = Data1D(x=(sector.x-math.pi)*180/math.pi,y=sector.y,dy=sector.dy)
         new_plot.dxl = dxl
         new_plot.dxw = dxw
-        new_plot.name = "SectorPhi" +"("+ self.base.data2D.name+")"
+        new_plot.name = "AnnulusPhi" +"("+ self.base.data2D.name+")"
         
         new_plot.source=self.base.data2D.source
@@ -157 +156 @@
         new_plot.xaxis("\\rm{\phi}", 'degrees')
         new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
-        new_plot.group_id = "SectorPhi"+self.base.data2D.name
-        new_plot.id= "SectorPhi"+self.base.data2D.name
+        new_plot.group_id = "AnnulusPhi"+self.base.data2D.name
+        new_plot.id= "AnnulusPhi"+self.base.data2D.name
         #new_plot.is_data= True
         
@@ -164 +163 @@
         new_plot.ytransform="y"
         wx.PostEvent(self.base.parent, NewPlotEvent(plot=new_plot,
-                                                 title="SectorPhi" ))
+                                                 title="AnnulusPhi" ))
         
          
@@ -181 +180 @@
         wx.PostEvent(self.base, event)
         # create a 1D data plot
-        self._post_data()
+        #self._post_data()
             
     def restore(self):

guiframe/local_perspectives/plotting/AzimutSlicer.py

@@ -201 +201 @@
         #print "main moveend ", event.params
         #wx.PostEvent(self.base.parent, event)
-        self._post_data()
+        #self._post_data()
+        pass
             
     def restore(self):