Changeset 44bbf6a in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Oct 22, 2008 12:35:02 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:

c0d9981

Parents:

978967c

Message:

panel 2d changed for dispersion display

File:

• sansview/perspectives/fitting/fitting.py (modified) (4 diffs)

sansview/perspectives/fitting/fitting.py

@@ -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:
     """
@@ -513 +517 @@
                     theory.x.append(tempx)
                     theory.y.append(tempy)
-                   
                 except:
                     wx.PostEvent(self.parent, StatusEvent(status="fitting \
@@ -519 +522 @@
             else:
                 theory=Data2D(data.image, data.err_image)
+                #theory=Theory2D(data.image, data.err_image)
                 theory.x_bins= data.x_bins
                 theory.y_bins= data.y_bins
@@ -530 +534 @@
                 if ymax==None:
                     ymax=data.ymax
-              
-                #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= model.runXY([data.x_bins[j],data.y_bins[i]])
+                    
+                theory.image = 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]])
                
-                    
-                    #print "fitting : plot_helper:", theory.image
+                #print "fitting : plot_helper:", theory.image
                 #print data.image
-                theory.image=model.runXY(data.image)
-                
                 #print "fitting : plot_helper:",theory.image
                 theory.zmin= data.zmin