Changeset 95d58d3 in sasview for src/sans/fit/ScipyFitting.py

Timestamp:

Apr 10, 2014 8:05:28 PM (11 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:

90f49a8

Parents:

6fe5100

Message:

fix fit line test for bumps/scipy/park and enable it as part of test suite

File:

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

src/sans/fit/ScipyFitting.py

@@ -49 +49 @@
         if len(self.true_res) == 0:
             return None
-        return total / len(self.true_res)
+        return total / (len(self.true_res) - len(self.paramlist))
 
     def __call__(self, params):
@@ -205 +205 @@
         _check_param_range(model.model, self.param_list)
         
-        result = FResult(model=model, data=data, param_list=self.param_list)
+        result = FResult(model=model.model, data=data, param_list=self.param_list)
         result.pars = fitproblem[0].pars
         result.fitter_id = self.fitter_id