Changeset 0e51519 in sasview

Timestamp:

Oct 17, 2008 4:22:59 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

49815a2

Parents:

539b1d6

Message:

set range for data

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (6 diffs)
• Fitting.py (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -183 +183 @@
        
        
-    def setFitRange(self,mini=None,maxi=None):
+    def setFitRange(self,qmin=None,qmax=None,ymin=None,ymax=None,):
         """ to set the fit range"""
-        self.qmin=mini
-        self.qmax=maxi
+        self.qmin=qmin
+        self.qmax=qmax
         
         
@@ -230 +230 @@
         self.y_bins= sans_data2d.y_bins
        
-        self.qmin= None
-        self.qmax= None
-       
-       
-    def setFitRange(self,mini=None,maxi=None):
+        self.xmin= self.data.xmin
+        self.xmax= self.data.xmax
+        self.ymin= self.data.ymin
+        self.ymax= self.data.ymax
+       
+       
+    def setFitRange(self,qmin=None,qmax=None,ymin=None,ymax=None):
         """ to set the fit range"""
-        self.qmin= mini
-        self.qmax= maxi
-        
+        self.xmin= qmin
+        self.xmax= qmax
+        self.ymin= ymin
+        self.ymax= ymax
         
     def getFitRange(self):
@@ -244 +247 @@
             @return the range of data.x to fit
         """
-        return self.qmin, self.qmax
+        return self.xmin, self.xmax,self.ymin, self.ymax
      
      
@@ -252 +255 @@
         """
         res=[]
-        if self.qmin==None and self.qmax==None: 
-            for i in range(len(self.x_bins)):
-                res.append( (self.image[i][i]- fn([self.x_bins[i],self.y_bins[i]]))\
-                            /self.err_image[i][i] )
-            return numpy.array(res)
-        else:
-            #idx = (x>=self.qmin) & (x <= self.qmax)
-            #fx = numpy.asarray([fn(item)for item in x[idx ]])
-            #return (y[idx] - fx)/dy[idx]
-            for i in range(len(self.x_bins)):
-                res.append( (self.image[i][i]- fn([self.x_bins[i],self.y_bins[i]]))\
-                            /self.err_image[i][i] )
-            return numpy.array(res)
+        if self.xmin==None:
+            self.xmin= self.data.xmin
+        if self.xmax==None:
+            self.xmax= self.data.xmax
+        if self.ymin==None:
+            self.ymin= self.data.ymin
+        if self.ymax==None:
+            self.ymax= self.data.ymax
+            
+        for i in range(len(self.y_bins)):
+            #if self.y_bins[i]>= self.ymin and self.y_bins[i]<= self.ymax:
+            for j in range(len(self.x_bins)):
+                #if self.x_bins[j]>= self.xmin and self.x_bins[j]<= self.xmax:
+                res.append( (self.image[j][i]- fn([self.x_bins[j],self.y_bins[i]]))\
+                            /self.err_image[j][i] )
+        
+        return numpy.array(res)
+       
+          
     def residuals_deriv(self, model, pars=[]):
         """ 
@@ -388 +397 @@
             raise ValueError, "park_integration:missing parameters"
     
-    def set_data(self,data,Uid,qmin=None,qmax=None):
+    def set_data(self,data,Uid,qmin=None,qmax=None,ymin=None,ymax=None):
         """ Receives plottable, creates a list of data to fit,set data
             in a FitArrange object and adds that object in a dictionary 
@@ -399 +408 @@
         else:
             fitdata=FitData1D(data)
-        if qmin !=None and qmax !=None:
-            fitdata.setFitRange(mini=qmin,maxi=qmax)
+       
+        fitdata.setFitRange(qmin=qmin,qmax=qmax, ymin=ymin,ymax=ymax)
         #A fitArrange is already created but contains model only at Uid
         if self.fitArrangeDict.has_key(Uid):

park_integration/Fitting.py

@@ -58 +58 @@
          self._engine.set_model(model,Uid,pars)
    
-    def set_data(self,data,Uid,qmin=None, qmax=None):
-        self._engine.set_data(data,Uid,qmin,qmax)
+    def set_data(self,data,Uid,qmin=None, qmax=None,ymin=None, ymax=None):
+        self._engine.set_data(data,Uid,qmin,qmax,ymin,ymax)
         
     def get_model(self,Uid):