Changeset d59cb8c in sasview for park_integration/src/sans

Timestamp:

Oct 11, 2011 10:23:55 AM (13 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:

444c900e

Parents:

4c712ea4

Message:

make sure the ftol value is used for park

File:

• park_integration/src/sans/fit/ParkFitting.py (modified) (4 diffs)

park_integration/src/sans/fit/ParkFitting.py

@@ -10 +10 @@
 import numpy
 import math
+from  numpy.linalg.linalg import LinAlgError
 #import park
 from park import fit
@@ -49 +50 @@
     maxiter = None
     """Maximum number of iterations before fit terminates"""
+    def __init__(self, ftol=5e-5):
+        self.ftol = ftol
+        
     def fit(self, fitness, x0):
         """Run the fit"""
@@ -106 +110 @@
     localfit = SansFitSimplex()
     start_points = 10
-
+    def __init__(self, localfit, start_points=10):
+        self.localfit = localfit
+        self.start_points = start_points
+        
     def _fit(self, objective, x0, bounds):
         """
@@ -391 +398 @@
         if handler == None:
             handler = fitresult.ConsoleUpdate(improvement_delta=0.1)
-        result = fit.fit(self.problem, fitter=fitter, handler=handler)
-        self.problem.all_results(result)
-        
-        #print "park------", result.inputs
-        #for (model, data) in result.inputs:
-        #    print model.name, data.name
-        #for p in result.parameters:
-        #    print "simul ----", p , p.__class__, p.model.name, p.data.name
-   
+        try:
+            result = fit.fit(self.problem, fitter=fitter, handler=handler)
+            self.problem.all_results(result)
+        except LinAlgError:
+            raise ValueError, "SVD did not converge"
+            
         if result != None:
             if q != None: