Changeset f668101 in sasview for src/sas/sascalc/fit

Timestamp:

Dec 7, 2016 9:16:33 AM (8 years ago)

Author:

jhbakker

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c6728e1

Parents:

1cad8a4 (diff), 5231948 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into Jurtest

Location:

src/sas/sascalc/fit

Files:

• BumpsFitting.py (modified) (5 diffs)
• AbstractFitEngine.py (modified) (2 diffs)

src/sas/sascalc/fit/BumpsFitting.py

@@ -4 +4 @@
 import os
 from datetime import timedelta, datetime
+import traceback
 
 import numpy
@@ -292 +293 @@
             R.success = result['success']
             if R.success:
-                R.stderr = numpy.hstack((result['stderr'][fitted_index],
-                                         numpy.NaN*numpy.ones(len(fitness.computed_pars))))
+                if result['stderr'] is None:
+                    R.stderr = numpy.NaN*numpy.ones(len(param_list))
+                else:
+                    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]))
@@ -305 +309 @@
                 R.uncertainty_state = result['uncertainty']
             all_results.append(R)
+        all_results[0].mesg = result['errors']
 
         if q is not None:
@@ -343 +348 @@
     try:
         best, fbest = fitdriver.fit()
-    except:
-        import traceback; traceback.print_exc()
-        raise
+        errors = []
+    except Exception as exc:
+        best, fbest = None, numpy.NaN
+        errors = [str(exc), traceback.traceback.format_exc()]
     finally:
         mapper.stop_mapper(fitdriver.mapper)
@@ -355 +361 @@
 
     success = best is not None
+    try:
+        stderr = fitdriver.stderr() if success else None
+    except Exception as exc:
+        errors.append(str(exc))
+        errors.append(traceback.format_exc())
+        stderr = None
     return {
         'value': best if success else None,
-        'stderr': fitdriver.stderr() if success else None,
+        'stderr': stderr,
         'success': success,
         'convergence': convergence,
         'uncertainty': getattr(fitdriver.fitter, 'state', None),
+        'errors': '\n'.join(errors),
         }
 

src/sas/sascalc/fit/AbstractFitEngine.py

@@ -131 +131 @@
         a way to get residuals from data.
     """
-    def __init__(self, x, y, dx=None, dy=None, smearer=None, data=None):
+    def __init__(self, x, y, dx=None, dy=None, smearer=None, data=None, lam=None, dlam=None):
         """
             :param smearer: is an object of class QSmearer or SlitSmearer
@@ -152 +152 @@
                 
         """
-        Data1D.__init__(self, x=x, y=y, dx=dx, dy=dy)
+        Data1D.__init__(self, x=x, y=y, dx=dx, dy=dy, lam=lam,dlam=dlam)
         self.num_points = len(x)
         self.sas_data = data