Changeset 1792311 in sasview

Timestamp:

Sep 8, 2014 6:14:40 AM (10 years ago)

Author:

pkienzle

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:

66f21cd

Parents:

72c969b

Message:

fix broken scipy tests

File:

• src/sans/fit/ScipyFitting.py (modified) (6 diffs)

src/sans/fit/ScipyFitting.py

@@ -11 +11 @@
 from sans.fit.AbstractFitEngine import FitEngine
 from sans.fit.AbstractFitEngine import FResult
+
+_SMALLVALUE = 1.0e-10
 
 class SansAssembly:
@@ -189 +191 @@
             raise RuntimeError, "No Assembly scheduled for Scipy fitting."
         model = fitproblem[0].get_model()
+        pars = fitproblem[0].pars
         if reset_flag:
             # reset the initial value; useful for batch
@@ -203 +206 @@
         
         # Check the initial value if it is within range
-        _check_param_range(model.model, self.param_list)
+        _check_param_range(model.model, pars)
         
-        result = FResult(model=model.model, data=data, param_list=self.param_list)
+        result = FResult(model=model.model, data=data, param_list=pars)
         result.fitter_id = self.fitter_id
         if handler is not None:
             handler.set_result(result=result)
-        functor = SansAssembly(paramlist=self.param_list,
+        functor = SansAssembly(paramlist=pars,
                                model=model,
                                data=data,
@@ -222 +225 @@
             
             out, cov_x, _, mesg, success = optimize.leastsq(functor,
-                                            model.get_params(self.param_list),
+                                            model.get_params(pars),
                                             ftol=ftol,
                                             full_output=1)
@@ -257 +260 @@
 
         
-def _check_param_range(model, param_list):
+def _check_param_range(model, pars):
     """
     Check parameter range and set the initial value inside
@@ -265 +268 @@
     """
     # loop through parameterset
-    for p in param_list:
+    for p in pars:
         value = model.getParam(p)
         low,high = model.details.setdefault(p,["",None,None])[1:3]