Changeset 4c718654 in sasview for park_integration/ScipyFitting.py

Timestamp:

Jul 11, 2008 10:34:14 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

d4b0687

Parents:

03a20aa

Message:

Introduced abstract engine

File:

• park_integration/ScipyFitting.py (modified) (4 diffs)

park_integration/ScipyFitting.py

@@ -7 +7 @@
 from Loader import Load
 from scipy import optimize
-
+from AbstractFitEngine import FitEngine, Parameter
 
 class FitArrange:
@@ -56 +56 @@
         self.dList=[]
             
-class ScipyFit:
+class ScipyFit(FitEngine):
     """ 
         ScipyFit performs the Fit.This class can be used as follow:
@@ -123 +123 @@
         return chisqr, out, cov
     
-    def _concatenateData(self, listdata=[]):
-        """  
-            _concatenateData method concatenates each fields of all data contains ins listdata.
-            @param listdata: list of data 
-            
-            @return xtemp, ytemp,dytemp:  x,y,dy respectively of data all combined
-                if xi,yi,dyi of two or more data are the same the second appearance of xi,yi,
-                dyi is ignored in the concatenation.
-                
-            @raise: if listdata is empty  will return None
-            @raise: if data in listdata don't contain dy field ,will create an error
-            during fitting
-        """
-        if listdata==[]:
-            raise ValueError, " data list missing"
-        else:
-            xtemp=[]
-            ytemp=[]
-            dytemp=[]
-               
-            for data in listdata:
-                for i in range(len(data.x)):
-                    if not data.x[i] in xtemp:
-                        xtemp.append(data.x[i])
-                       
-                    if not data.y[i] in ytemp:
-                        ytemp.append(data.y[i])
-                    if data.dy and len(data.dy)>0:   
-                        if not data.dy[i] in dytemp:
-                            dytemp.append(data.dy[i])
-                    else:
-                        raise ValueError,"dy is missing will not be able to fit later on"
-            return xtemp, ytemp,dytemp
-        
     def set_model(self,model,name,Uid,pars={}):
         """ 
@@ -222 +188 @@
         if self.fitArrangeList.has_key(Uid):
             del self.fitArrangeList[Uid]
-                
-
-class Parameter:
-    """
-        Class to handle model parameters
-    """
-    def __init__(self, model, name, value=None):
-            self.model = model
-            self.name = name
-            if not value==None:
-                self.model.setParam(self.name, value)
-           
-    def set(self, value):
-        """
-            Set the value of the parameter
-        """
-        self.model.setParam(self.name, value)
-
-    def __call__(self):
-        """ 
-            Return the current value of the parameter
-        """
-        return self.model.getParam(self.name)
-    
+      
 def fitHelper(model, pars, x, y, err_y ,qmin=None, qmax=None):
     """