Changeset 57668f8 in sasview for sansview

Timestamp:

Nov 5, 2008 4:59:05 PM (16 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:

743d75c

Parents:

415bc97

Message:

working on sector averaging

Location:

sansview/perspectives/fitting

Files:

• fitpage2D.py (modified) (1 diff)
• fitting.py (modified) (5 diffs)

sansview/perspectives/fitting/fitpage2D.py

@@ -226 +226 @@
                         for j in range(len(self.data.x_bins)):
                             if self.data.x_bins[j]>= xmin and self.data.x_bins[j]<= xmax:
-                                res.append( (self.data.image[j][i]- self.model.runXY(\
+                                res.append( (self.data.data[j][i]- self.model.runXY(\
                                  [self.data.x_bins[j],self.data.y_bins[i]]))\
-                                    /self.data.err_image[j][i] )
+                                    /self.data.err_data[j][i] )
                 sum=0
                

sansview/perspectives/fitting/fitting.py

@@ -1 +1 @@
 import os,os.path, re
 import sys, wx, logging
-import string, numpy, pylab, math
+import string, numpy,  math
 
 from copy import deepcopy 
-from danse.common.plottools.plottables import Data1D, Theory1D, Data2D
+from danse.common.plottools.plottables import Data1D, Theory1D,Data2D,Theory2D
 from danse.common.plottools.PlotPanel import PlotPanel
 from sans.guicomm.events import NewPlotEvent, StatusEvent  
@@ -14 +14 @@
 import fitpage1D,fitpage2D
 import park
-class Theory2D(Data2D):
-    def __init__(self,image=None,err_image=None,xmin=None,
-                 xmax=None,ymin=None,ymax=None,zmin=None,zmax=None):
-        Data2D.__init__(self,image,err_image,xmin,
-                        xmax,ymin,ymax,zmin,zmax)
+
 class Plugin:
     """
@@ -96 +92 @@
                 return [["Select data  for Fitting",\
                           "Dialog with fitting parameters ", self._onSelect]] 
+            #elif item.__class__.__name__ is "Theory2D":
+            #     return [["Line Slicer [Q-view]","Sector Averaging as a function of Q",
+            #             self.onLineSlicer],
+            #             ["Annulus Slicer [Phi-view]","Sector Averaging as a function of Phi",
+            #             self.onLineSlicer]]
             else:
                 if item.name==graph.selected_plottable and\
@@ -528 +529 @@
                 
             else:
-                theory=Data2D(data.image, data.err_image)
+                theory=Theory2D(data.data, data.err_data)
                 #theory=Theory2D(data.image, data.err_image)
                 theory.x_bins= data.x_bins
@@ -542 +543 @@
                     ymax=data.ymax
                     
-                theory.image = numpy.zeros((len(data.y_bins),len(data.x_bins)))
+                theory.data = numpy.zeros((len(data.y_bins),len(data.x_bins)))
                 for i in range(len(data.y_bins)):
                     if data.y_bins[i]>= ymin and data.y_bins[i]<= ymax:
                         for j in range(len(data.x_bins)):
                             if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
-                                theory.image[j][i]=model.runXY([data.x_bins[j],data.y_bins[i]])
+                                theory.data[j][i]=model.runXY([data.x_bins[j],data.y_bins[i]])
                
                 #print "fitting : plot_helper:", theory.image