Changeset f69bc394 in sasview

Timestamp:

Feb 17, 2009 10:41:53 AM (16 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:

3c37ba2

Parents:

dd66fbd

Message:

fixed bug in model 2d plot

File:

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

sansview/perspectives/fitting/fitting.py

@@ -636 +636 @@
                 for i in range(len(data.x)):
                     try:
-                        if data.x[i]> qmin and data.x[i]< qmax: # 1d fit range
+                        if data.x[i]> qmin and data.x[i]< qmax: 
                             tempx = data.x[i]
                             tempy = model.run(tempx)
@@ -669 +669 @@
                 theory.x_bins= data.x_bins
                 theory.y_bins= data.y_bins
+                    
                 tempy=[]
                 #print "max x,y",max(data.xmax,data.xmin),max(data.ymax,data.ymin)
@@ -683 +684 @@
                     xmin=data.xmin
                 if xmax==None:
-                    xmax=data.xmax                    
-                #print " q range =",    
+                    xmax=data.xmax      
+                                  
                 theory.data = numpy.zeros((len(data.y_bins),len(data.x_bins)))
                 for j in range(len(data.y_bins)):
@@ -693 +694 @@
                         else:
                             theory.data[j][i]=0 #None # Later, We need to decide which of  0 and None is better.
-                #print "len(data.x_bins),len(data.y_bins);",len(data.x_bins),len(data.y_bins),i,j
+                #print "len(data.x_bins),len(data.y_bins);",len(data.x_bins),len(data.y_bins),qmax
                 #print "fitting : plot_helper:", theory.image
                 #print "fitting : plot_helper:",theory.image
@@ -853 +854 @@
        
         
-        theory.xmin= -qmax/math.sqrt(2)
-        theory.xmax= qmax/math.sqrt(2)
-        theory.ymin= -qmax/math.sqrt(2)
-        theory.ymax= qmax/math.sqrt(2)
+        theory.xmin= -qmax#/math.sqrt(2)#You can not do sqrt(2), that changes axis scale not data itself
+        theory.xmax= qmax#/math.sqrt(2)
+        theory.ymin= -qmax#/math.sqrt(2)
+        theory.ymax= qmax#/math.sqrt(2)
         
         print "model draw comptele xmax",theory.xmax,model.name