Changeset e71440c in sasview for park_integration

Timestamp:

Sep 23, 2008 3:11:08 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:

442895f

Parents:

5f96484

Message:

changes on setparams to fix fit

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (5 diffs)
• ScipyFitting.py (modified) (1 diff)
• test/testdata_line1.txt (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -86 +86 @@
     
     
-    def setParams(self, params):
+    def setParams(self,paramlist, params):
         """
             Set value for parameters to fit
             @param params: list of value for parameters to fit 
         """
-        list=[]
-        for item in self.parkp:
-            list.append(item.name)
-        list.sort()
-        for i in range(len(params)):
-            self.parkp[i].value = params[i]
-            self.model.setParam(list[i],params[i])
-  
+        try:
+            for i in range(len(self.parkp)):
+                for j in range(len(paramlist)):
+                    if self.parkp[i].name==paramlist[j]:
+                        self.parkp[i].value = params[j]
+                        self.model.setParam(self.parkp[i].name,params[j])
+        except:
+            raise
   
     def eval(self,x):
@@ -158 +158 @@
             fx = numpy.asarray([fn(item)for item in x[idx ]])
             return (y[idx] - fx)/dy[idx]
-          
-            
-         
+        
     def residuals_deriv(self, model, pars=[]):
         """ 
@@ -172 +170 @@
          Sans Assembly class a class wrapper to be call in optimizer.leastsq method
     """
-    def __init__(self,Model=None , Data=None):
+    def __init__(self,paramlist,Model=None , Data=None):
         """
             @param Model: the model wrapper fro sans -model
@@ -179 +177 @@
         self.model = Model
         self.data  = Data
+        self.paramlist=paramlist
         self.res=[]
     def chisq(self, params):
@@ -195 +194 @@
             @param params: value of parameters to fit
         """
-        self.model.setParams(params)
+        self.model.setParams(self.paramlist,params)
         self.res= self.data.residuals(self.model.eval)
         return self.res

park_integration/ScipyFitting.py

@@ -76 +76 @@
         if qmax==None:
             qmax= max(data.x) 
-        functor= sansAssembly(model,data)
-       
+        functor= sansAssembly(self.paramList,model,data)
         out, cov_x, info, mesg, success = optimize.leastsq(functor,model.getParams(self.paramList), full_output=1, warning=True)
         chisqr = functor.chisq(out)
+        
         if cov_x is not None and numpy.isfinite(cov_x).all():
             stderr = numpy.sqrt(numpy.diag(cov_x))
-        
+        else:
+            stderr=None
         if not (numpy.isnan(out).any()) or ( cov_x !=None) :
                 result = fitresult()

park_integration/test/testdata_line1.txt

@@ -1 @@
-#y=A*x+B
-#A=2.5
-#B=4
+#y=A+x*B
+#B=2.5
+#A=4
 0  2.83954  0.6
 0.204082  3.44938  0.6