Changeset ee5b04c in sasview for park_integration

Timestamp:

Aug 11, 2008 3:57:21 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:

f44dbc7

Parents:

0eb801a

Message:

comment added

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (4 diffs)
• ParkFitting.py (modified) (2 diffs)
• ScipyFitting.py (modified) (4 diffs)

park_integration/AbstractFitEngine.py

@@ -1 +1 @@
 
 class FitEngine:
-    
+    def __init__(self):
+        self.paramList=[]
     def _concatenateData(self, listdata=[]):
         """  
@@ -29 +30 @@
                         dytemp.append(data.dy[i])
                     else:
-                        raise RuntimeError, "Fit._concatenateData: y-errors missinge"
+                        raise RuntimeError, "Fit._concatenateData: y-errors missing"
             return xtemp, ytemp,dytemp
     
@@ -47 +48 @@
         """
         print "AbstractFitEngine:  fitting parmater",pars
-        temp=[]
+       
         if pars !={}:
             self.parameters=[]
-            self.paramList=[]
+            
             if model==None:
                 raise ValueError, "Cannot set parameters for empty model"
@@ -58 +59 @@
                     param = Parameter(model, key, value)
                     self.parameters.append(param)
-                    temp.append(key)
-            self.paramList.append(temp)
+                   
+                    self.paramList.append(key)
             print "AbstractFitEngine: self.paramList2", self.paramList
             #A fitArrange is already created but contains dList only at Uid

park_integration/ParkFitting.py

@@ -141 +141 @@
         """
         self.fitArrangeList={}
-        
+        self.paramList=[]
         
     def createProblem(self):
@@ -204 +204 @@
         localfit.ftol = 1e-8
         fitter = FitMC(localfit=localfit)
-        try:
-            
-            result = fit.fit(self.problem,
-                         fitter=fitter,
-                         handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
-          
+        
+        result = fit.fit(self.problem,
+                     fitter=fitter,
+                     handler= fitresult.ConsoleUpdate(improvement_delta=0.1))
+        print "ParkFitting: result",result
+        if result !=None:
             #for p in result.parameters:
             #    print "fit in park fitting", p.name, p.value,p.stderr
             return result.fitness,result.pvec,result.cov,result
-           
-        except :
-            raise
-            return
+        else:
+            raise ValueError, "SVD did not converge"
+            
+        
         
     

park_integration/ScipyFitting.py

@@ -41 +41 @@
         """
         self.fitArrangeList={}
+        self.paramList=[]
         
     def fit(self,qmin=None, qmax=None):
@@ -64 +65 @@
         model = fitproblem.get_model()
         listdata = fitproblem.get_data()
-        
-       
         # Concatenate dList set (contains one or more data)before fitting
         xtemp,ytemp,dytemp=self._concatenateData( listdata)
-        
-        #print "dytemp",dytemp
         #Assign a fit range is not boundaries were given
         if qmin==None:
@@ -75 +72 @@
         if qmax==None:
             qmax= max(xtemp) 
-        
         #perform the fit 
         chisqr, out, cov = fitHelper(model,self.parameters, xtemp,ytemp, dytemp ,qmin,qmax)
-        
         return chisqr, out, cov
     
@@ -108 +103 @@
         residuals = []
         for j in range(len(x)):
-            if x[j]>qmin and x[j]<qmax:
+            if x[j] >= qmin and x[j] <= qmax:
                 residuals.append( ( y[j] - model.runXY(x[j]) ) / err_y[j] )