Changeset bd82069 in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Feb 16, 2009 8:56:18 AM (15 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:

39a365d

Parents:

8566c05

Message:

Enabled 2d fit plot display between qmin and qmax

File:

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

sansview/perspectives/fitting/fitting.py

@@ -632 +632 @@
                 for i in range(len(data.x)):
                     try:
-                        if data.x[i]> qmin and data.x[i]< qmax:
+                        if data.x[i]> qmin and data.x[i]< qmax: # 1d fit range
                             tempx = data.x[i]
                             tempy = model.run(tempx)
@@ -668 +668 @@
                 #print "max x,y",max(data.xmax,data.xmin),max(data.ymax,data.ymin)
                 if qmin==None:
-                    qmin=0#data.xmin
+                    qmin=0#min(math.fabs(data.xmax),math.fabs(data.ymin))
                 if qmax==None:
                     qmax=math.sqrt(math.pow(max(math.fabs(data.xmax),math.fabs(data.xmin)),2)/
@@ -685 +685 @@
                     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 and tempqij<= qmax: 
-                        theory.data[j][i]=model.runXY([data.y_bins[j],data.x_bins[i]])
-                        #else:
-                            #theory.data[j][i]=None
+                        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 #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 "fitting : plot_helper:", theory.image