Changeset 4af20b4 in sasview

Timestamp:

Feb 5, 2009 2:41:49 PM (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:

10c43a5

Parents:

e191da5

Message:

Add xmax and xmin to 2d fit function in addition to qmax and qmin for 2d fitting range

File:

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

sansview/perspectives/fitting/fitting.py

@@ -264 +264 @@
         
    
-    def _single_fit_completed(self,result,pars,cpage,qmin,qmax,elapsed,ymin=None, ymax=None):
+    def _single_fit_completed(self,result,pars,cpage,qmin,qmax,elapsed,
+                              ymin=None, ymax=None, xmin=None, xmax=None):
         """
             Display fit result on one page of the notebook.
@@ -296 +297 @@
             print "fitting result : pvec",result.pvec
             print "fitting result : stderr",result.stderr
-            print "xmin xmax ymin , ymax",qmin, qmax, ymin, ymax
+            print "qmin qmax xmin xmax ymin , ymax",qmin, qmax,xmin, xmax ,ymin, ymax
             
             cpage.onsetValues(result.fitness, result.pvec,result.stderr)
-            self.plot_helper(currpage=cpage,qmin=qmin,qmax=qmax,ymin=ymin, ymax=ymax, title="Fitted model 2D ")
+            self.plot_helper(currpage=cpage,qmin=qmin,qmax=qmax,
+                             ymin=ymin, ymax=ymax,
+                             xmin=xmin, xmax=xmax,title="Fitted model 2D ")
         except:
             #raise
@@ -338 +341 @@
             
   
-    def _on_single_fit(self,id=None,qmin=None,qmax=None,ymin=None, ymax=None):
+    def _on_single_fit(self,id=None,qmin=None, qmax=None,ymin=None, ymax=None,xmin=None,xmax=None):
         """ 
             perform fit for the  current page  and return chisqr,out and cov
@@ -565 +568 @@
         
     def plot_helper(self,currpage, fitModel=None, qmin=None,qmax=None,
-                    ymin=None,ymax=None, title=None ):
+                    ymin=None,ymax=None, xmin=None, xmax=None,title=None ):
         """
             Plot a theory given a model and data
@@ -591 +594 @@
                    qmin = min(data.x)
                 if qmax == None :
-                    qmax = max(data.x)
+                   qmax = max(data.x)
                 try:
                     tempx = qmin
@@ -637 +640 @@
                 theory.y_bins= data.y_bins
                 tempy=[]
+                print "max x,y",max(data.xmax,data.xmin),max(data.ymax,data.ymin)
                 if qmin==None:
-                    qmin=data.xmin
+                    qmin=0#data.xmin
                 if qmax==None:
-                    qmax=data.xmax
+                    qmax=math.sqrt(math.pow(max(math.fabs(data.xmax),math.fabs(data.xmin)),2)/
+                                   +math.pow(max(math.fabs(data.ymax),math.fabs(data.ymin)),2))
                 if ymin==None:
                     ymin=data.ymin
                 if ymax==None:
                     ymax=data.ymax
-                xmin=data.xmin
-                xmax=data.xmax
+                if xmin ==None:
+                    xmin=data.xmin
+                if xmax==None:
+                    xmax=data.xmax                    
                 #print " q range =",    
                 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:
+                for j in range(len(data.y_bins)):
+                    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]])
-                            else:
-                                Inf=1e+5000
-                                Nan=Inf*0
-                                theory.data[j][i]=Nan
+                        else:
+                            theory.data[j][i]=0
                
                 #print "fitting : plot_helper:", theory.image