Changeset e1442d4 in sasview for src/sas

Timestamp:

Jun 2, 2015 9:51:34 AM (9 years ago)

Author:

Paul Kienzle <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:

b99a4552

Parents:

422e7e8

Message:

better handling of unsuccessful bumps fits

Location:

src/sas

Files:

• fit/BumpsFitting.py (modified) (5 diffs)
• perspectives/fitting/fitting.py (modified) (1 diff)

src/sas/fit/BumpsFitting.py

@@ -271 +271 @@
             fitness = M.fitness
             fitted_index = [varying.index(p) for p in fitness.fitted_pars]
+            param_list = fitness.fitted_par_names + fitness.computed_par_names
             R = FResult(model=fitness.model, data=fitness.data,
-                        param_list=fitness.fitted_par_names+fitness.computed_par_names)
+                        param_list=param_list)
             R.theory = fitness.theory()
             R.residuals = fitness.residuals()
@@ -278 +279 @@
             R.fitter_id = self.fitter_id
             # TODO: should scale stderr by sqrt(chisq/DOF) if dy is unknown
-            R.stderr = numpy.hstack((result['stderr'][fitted_index],
-                                     numpy.NaN*numpy.ones(len(fitness.computed_pars))))
-            R.pvec = numpy.hstack((result['value'][fitted_index],
-                                  [p.value for p in fitness.computed_pars]))
             R.success = result['success']
-            R.fitness = numpy.sum(R.residuals**2)/(fitness.numpoints() - len(fitted_index))
+            if R.success:
+                R.stderr = numpy.hstack((result['stderr'][fitted_index],
+                                         numpy.NaN*numpy.ones(len(fitness.computed_pars))))
+                R.pvec = numpy.hstack((result['value'][fitted_index],
+                                      [p.value for p in fitness.computed_pars]))
+                R.fitness = numpy.sum(R.residuals**2)/(fitness.numpoints() - len(fitted_index))
+            else:
+                R.stderr = numpy.NaN*numpy.ones(len(param_list))
+                R.pvec = numpy.asarray( [p.value for p in fitness.fitted_pars+fitness.computed_pars])
+                R.fitness = numpy.NaN
             R.convergence = result['convergence']
             if result['uncertainty'] is not None:
@@ -310 +316 @@
     max_step = fitopts.options.get('steps', 0) + fitopts.options.get('burn', 0)
     pars = [p.name for p in problem._parameters]
+    #x0 = numpy.asarray([p.value for p in problem._parameters])
     options['monitors'] = [
         BumpsMonitor(handler, max_step, pars, problem.dof),
@@ -317 +324 @@
                                   abort_test=abort_test, **options)
     omp_threads = int(os.environ.get('OMP_NUM_THREADS','0'))
-    mapper = MPMapper if omp_threads == 1 else SerialMapper       
+    mapper = MPMapper if omp_threads == 1 else SerialMapper
     fitdriver.mapper = mapper.start_mapper(problem, None)
     #import time; T0 = time.time()
@@ -332 +339 @@
     convergence = (2*numpy.asarray(convergence_list)/problem.dof
                    if convergence_list else numpy.empty((0,1),'d'))
+
+    success = best is not None
     return {
-        'value': best,
-        'stderr': fitdriver.stderr(),
-        'success': True, # better success reporting in bumps
+        'value': best if success else None,
+        'stderr': fitdriver.stderr() if success else None,
+        'success': success,
         'convergence': convergence,
         'uncertainty': getattr(fitdriver.fitter, 'state', None),

src/sas/perspectives/fitting/fitting.py

@@ -1511 +1511 @@
 
         except:
-            msg = "Fit completed but Following"
-            msg += " warning occurred: %s" % sys.exc_value
+            msg = ("Fit completed but the following error occurred: %s"
+                   % sys.exc_value)
+            #import traceback; msg = "\n".join((traceback.format_exc(), msg))
             wx.PostEvent(self.parent, StatusEvent(status=msg, info="warning",
                                                   type="stop"))