Changeset 22210ef in sasview for sansview/perspectives

Timestamp:

Feb 7, 2009 10:15:56 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:

ff7acff

Parents:

ae2d445

Message:

Fixed bug not showing qmax in q range box for 2d fitting

File:

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

sansview/perspectives/fitting/fitting.py

@@ -640 +640 @@
                 theory.y_bins= data.y_bins
                 tempy=[]
-                print "max x,y",max(data.xmax,data.xmin),max(data.ymax,data.ymin)
+                #print "max x,y",max(data.xmax,data.xmin),max(data.ymax,data.ymin)
                 if qmin==None:
                     qmin=0#data.xmin
@@ -659 +659 @@
                     for i in range(len(data.x_bins)):
                         tempqij=math.sqrt((math.pow(data.y_bins[j],2)+math.pow(data.x_bins[i],2)))
-                        if tempqij>= qmin: 
-                            if tempqij<= qmax:
-                                theory.data[j][i]=model.runXY([data.y_bins[j],data.x_bins[i]])
+                        if tempqij>= qmin and tempqij<= qmax: 
+                            theory.data[j][i]=model.runXY([data.y_bins[j],data.x_bins[i]])
                         else:
-                            theory.data[j][i]=0
-               
+                            theory.data[j][i]=None
+                print "len(data.x_bins),len(data.y_bins);",len(data.x_bins),len(data.y_bins),i,j
                 #print "fitting : plot_helper:", theory.image
-                #print data.image
                 #print "fitting : plot_helper:",theory.image
                 theory.detector= data.detector
                 theory.source= data.source
-                theory.zmin= data.zmin
-                theory.zmax= data.zmax
+                
                 theory.xmin= xmin
                 theory.xmax= xmax
@@ -703 +700 @@
         """
         if data !=None:
-            print "qmin qmax",qmin, qmax
             self.redraw_model(qmin,qmax)
             return 
@@ -791 +787 @@
         theory.group_id ="Model"
         theory.id ="Model"
+        
+       
+        
         theory.xmin= -qmax
         theory.xmax= qmax