Changeset 17fc6f8 in sasview

Timestamp:

Feb 4, 2009 3:54:52 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:

2caecd5

Parents:

3e8e627

Message:

making sure that uid is assigned correctly for 2d fit

File:

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

sansview/perspectives/fitting/fitting.py

@@ -332 +332 @@
             
   
-    def _on_single_fit(self,id=None,qmin=None,qmax=None):
+    def _on_single_fit(self,id=None,qmin=None,qmax=None,ymin=None, ymax=None):
         """ 
             perform fit for the  current page  and return chisqr,out and cov
@@ -346 +346 @@
         #Setting an id to store model and data in fit engine
         if id==None:
-            id=0
-        self.id = id
+            self.id=0
+        else:
+            self.id = id
         page_fitted=None
         fit_problem=None
@@ -374 +375 @@
                     #Do the single fit
                     self.fitter.set_model(Model(model), self.id, pars) 
-                   
-                    self.fitter.set_data(metadata,self.id,smearer, qmin,qmax)
+                    print "args...:",metadata,self.id,smearer,qmin,qmax,ymin,ymax
+                  
+                    self.fitter.set_data(data=metadata,Uid=self.id,
+                                         smearer=smearer,qmin= qmin,qmax=qmax,
+                                         ymin=ymin,ymax=ymax)
+                    
                     self.fitter.select_problem_for_fit(Uid=self.id,value=value.get_scheduled())
                     page_fitted=page
@@ -463 +468 @@
                           
                     self.fitter.set_model(new_model, self.id, pars) 
+                    
                     self.fitter.set_data(metadata,self.id,qmin,qmax,ymin,ymax)
                     self.fitter.select_problem_for_fit(Uid=self.id,value=value.get_scheduled())
@@ -626 +632 @@
                 theory.y_bins= data.y_bins
                 tempy=[]
-                #if qmin==None:
-                qmin=data.xmin
-                #if qmax==None:
-                qmax=data.xmax
-                #if ymin==None:
-                ymin=data.ymin
-                #if ymax==None:
-                ymax=data.ymax
+                if qmin==None:
+                    qmin=data.xmin
+                if qmax==None:
+                    qmax=data.xmax
+                if ymin==None:
+                    ymin=data.ymin
+                if ymax==None:
+                    ymax=data.ymax
+                xmin=data.xmin
+                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)):
+                for j in range(len(data.y_bins)):
+                    if data.y_bins[j]>= ymin and data.y_bins[j]<= ymax:
+                        for i in range(len(data.x_bins)):
                             if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
-                                theory.data[i][j]=model.runXY([data.x_bins[j],data.y_bins[i]])
+                                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
                
                 #print "fitting : plot_helper:", theory.image
@@ -649 +661 @@
                 theory.zmin= data.zmin
                 theory.zmax= data.zmax
-                theory.xmin= qmin
-                theory.xmax= qmax
+                theory.xmin= xmin
+                theory.xmax= xmax
                 theory.ymin= ymin
                 theory.ymax= ymax