Changeset b768e92 in sasview for src/sas

Timestamp:

Jun 2, 2016 10:14:35 AM (9 years ago)

Author:

Gonzalez, Miguel <gonzalez@…>

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

Children:

ec30905

Parents:

6afc14b (diff), 70305bd2 (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' of ​https://github.com/SasView/sasview

Location:

src/sas

Files:

• sascalc/calculator/c_extensions/librefl.c (modified) (1 diff)
• sascalc/calculator/c_extensions/sld2i.cpp (modified) (2 diffs)
• sascalc/calculator/c_extensions/sld2i.hh (modified) (1 diff)
• sascalc/calculator/c_extensions/sld2i_module.cpp (modified) (1 diff)
• sascalc/calculator/c_extensions/winFuncs.c (deleted)
• sascalc/calculator/c_extensions/winFuncs.h (deleted)
• sascalc/data_util/calcthread.py (modified) (5 diffs)
• sascalc/dataloader/readers/cansas_reader.py (modified) (1 diff)
• sascalc/pr/c_extensions/Cinvertor.c (modified) (15 diffs)
• sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) (2 diffs)
• sasgui/perspectives/calculator/model_editor.py (modified) (9 diffs)
• sasgui/perspectives/calculator/pyconsole.py (modified) (8 diffs)
• sasgui/perspectives/fitting/__init__.py (modified) (1 diff)
• sasgui/perspectives/fitting/fitpage.py (modified) (2 diffs)
• sasgui/perspectives/fitting/fitpanel.py (modified) (2 diffs)
• sasgui/perspectives/fitting/fitting.py (modified) (22 diffs)
• sasgui/perspectives/fitting/model_thread.py (modified) (2 diffs)
• sasgui/perspectives/fitting/plugin_models/__init__.py (added)
• sasgui/perspectives/invariant/media/invariant_help.rst (modified) (1 diff)
• sasgui/plottools/plottables.py (modified) (3 diffs)
• sasgui/perspectives/fitting/models.py (modified) (1 diff)

src/sas/sascalc/calculator/c_extensions/librefl.c

@@ -8 +8 @@
 #include <stdlib.h>
 #if defined(_MSC_VER)
-#include "winFuncs.h"
+#define NEED_ERF
 #endif
+
+
+
+#if defined(NEED_ERF)
+/* erf.c  - public domain implementation of error function erf(3m)
+
+reference - Haruhiko Okumura: C-gengo niyoru saishin algorithm jiten
+            (New Algorithm handbook in C language) (Gijyutsu hyouron
+            sha, Tokyo, 1991) p.227 [in Japanese]                 */
+
+
+#ifdef _WIN32
+# include <float.h>
+# if !defined __MINGW32__ || defined __NO_ISOCEXT
+#  ifndef isnan
+#   define isnan(x) _isnan(x)
+#  endif
+#  ifndef isinf
+#   define isinf(x) (!_finite(x) && !_isnan(x))
+#  endif
+#  ifndef finite
+#   define finite(x) _finite(x)
+#  endif
+# endif
+#endif
+
+static double q_gamma(double, double, double);
+
+/* Incomplete gamma function
+   1 / Gamma(a) * Int_0^x exp(-t) t^(a-1) dt  */
+static double p_gamma(double a, double x, double loggamma_a)
+{
+    int k;
+    double result, term, previous;
+
+    if (x >= 1 + a) return 1 - q_gamma(a, x, loggamma_a);
+    if (x == 0)     return 0;
+    result = term = exp(a * log(x) - x - loggamma_a) / a;
+    for (k = 1; k < 1000; k++) {
+        term *= x / (a + k);
+        previous = result;  result += term;
+        if (result == previous) return result;
+    }
+    fprintf(stderr, "erf.c:%d:p_gamma() could not converge.", __LINE__);
+    return result;
+}
+
+/* Incomplete gamma function
+   1 / Gamma(a) * Int_x^inf exp(-t) t^(a-1) dt  */
+static double q_gamma(double a, double x, double loggamma_a)
+{
+    int k;
+    double result, w, temp, previous;
+    double la = 1, lb = 1 + x - a;  /* Laguerre polynomial */
+
+    if (x < 1 + a) return 1 - p_gamma(a, x, loggamma_a);
+    w = exp(a * log(x) - x - loggamma_a);
+    result = w / lb;
+    for (k = 2; k < 1000; k++) {
+        temp = ((k - 1 - a) * (lb - la) + (k + x) * lb) / k;
+        la = lb;  lb = temp;
+        w *= (k - 1 - a) / k;
+        temp = w / (la * lb);
+        previous = result;  result += temp;
+        if (result == previous) return result;
+    }
+    fprintf(stderr, "erf.c:%d:q_gamma() could not converge.", __LINE__);
+    return result;
+}
+
+#define LOG_PI_OVER_2 0.572364942924700087071713675675 /* log_e(PI)/2 */
+
+double erf(double x)
+{
+    if (!finite(x)) {
+        if (isnan(x)) return x;      /* erf(NaN)   = NaN   */
+        return (x>0 ? 1.0 : -1.0);   /* erf(+-inf) = +-1.0 */
+    }
+    if (x >= 0) return   p_gamma(0.5, x * x, LOG_PI_OVER_2);
+    else        return - p_gamma(0.5, x * x, LOG_PI_OVER_2);
+}
+
+double erfc(double x)
+{
+    if (!finite(x)) {
+        if (isnan(x)) return x;      /* erfc(NaN)   = NaN      */
+        return (x>0 ? 0.0 : 2.0);    /* erfc(+-inf) = 0.0, 2.0 */
+    }
+    if (x >= 0) return  q_gamma(0.5, x * x, LOG_PI_OVER_2);
+    else        return  1 + p_gamma(0.5, x * x, LOG_PI_OVER_2);
+}
+#endif // NEED_ERF
 
 complex cassign(real, imag)

src/sas/sascalc/calculator/c_extensions/sld2i.cpp

@@ -164 +164 @@
         //Assume that pixel volumes are given in vol_pix in A^3 unit
         // Loop over q-values and multiply apply matrix
-        for(size_t i=0; i<npoints; i++){
+        for(int i=0; i<npoints; i++){
                 sumj =0.0;              
-                for(size_t j=0; j<n_pix; j++){
+                for(int j=0; j<n_pix; j++){
                         //Isotropic: Assumes all slds are real (no magnetic)
                         //Also assumes there is no polarization: No dependency on spin
@@ -183 +183 @@
                                 //full calculation
                                 //pragma omp parallel for
-                                for(size_t k=0; k<n_pix; k++){
+                                for(int k=0; k<n_pix; k++){
                                         sld_j =  sldn_val[j] * sldn_val[k] * vol_pix[j] * vol_pix[k];
                                         qr = (x_val[j]-x_val[k])*(x_val[j]-x_val[k])+

src/sas/sascalc/calculator/c_extensions/sld2i.hh

@@ -39 +39 @@
                         double s_theta);
         // compute function
-        virtual void genicomXY(int npoints, double* qx, double* qy, double *I_out);
-        virtual void genicom(int npoints, double* q, double *I_out);
+        void genicomXY(int npoints, double* qx, double* qy, double *I_out);
+        void genicom(int npoints, double* q, double *I_out);
 };
 

src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp

@@ -153 +153 @@
 initsld2i(void)
 {
-    PyObject* m;
-
-    m = Py_InitModule3("sld2i", module_methods,
-                       "Sld2i module");
+    Py_InitModule3("sld2i", module_methods, "Sld2i module");
 }

src/sas/sascalc/data_util/calcthread.py

@@ -119 +119 @@
 
     def __init__(self, completefn=None, updatefn=None,
-                 yieldtime=0.01, worktime=0.01):
+                 yieldtime=0.01, worktime=0.01,
+                 exception_handler=None):
         """Prepare the calculator"""
         self.yieldtime     = yieldtime
@@ -125 +126 @@
         self.completefn    = completefn
         self.updatefn      = updatefn
+        self.exception_handler = exception_handler
         self._interrupting = False
         self._running      = False
@@ -199 +201 @@
 
     def update(self, **kwargs):
-
         """Update GUI with the lastest results from the current work unit."""
         if self.updatefn != None and clock() > self._time_for_update:
@@ -225 +226 @@
         """Perform a work unit.  The subclass will provide details of
         the arguments."""
-        raise NotImplemented, "Calculation thread needs compute method"
+        raise NotImplemented("Calculation thread needs compute method")
+
+    def exception(self):
+        """
+        An exception occurred during computation, so call the exception handler
+        if there is one.  If not, then log the exception and continue.
+        """
+        # If we have an exception handler, let it try to handle the exception.
+        # If it fails fall through to log the failure to handle the exception
+        # (the original exception will be lost).  If there is no exception
+        # handler, just log the exception in compute that we are responding to.
+        if self.exception_handler:
+            try:
+                self.exception_handler(*sys.exc_info())
+                return
+            except Exception:
+                pass
+        import logging
+        logging.error(traceback.format_exc())
+        #print 'CalcThread exception',
 
     def _run(self):
@@ -250 +270 @@
                 pass
             except:
-                traceback.print_exc()
-                #print 'CalcThread exception',
+                self.exception()
         self._running = False
 

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -221 +221 @@
                             output.append(return_value)
                     else:
-                        output.append("Invalid XML at: {0}".format(\
-                                                    self.find_invalid_xml()))
+                        raise RuntimeError, "Invalid XML at: {0}".format(\
+                                                    self.find_invalid_xml())
                 except:
                     # If the file does not match the schema, raise this error

src/sas/sascalc/pr/c_extensions/Cinvertor.c

@@ -115 +115 @@
 
         //self->params.x = data;
-        self->params.npoints = ndata;
+        self->params.npoints = (int)ndata;
         return Py_BuildValue("i", self->params.npoints);
 }
@@ -180 +180 @@
 
         //self->params.y = data;
-        self->params.ny = ndata;
+        self->params.ny = (int)ndata;
         return Py_BuildValue("i", self->params.ny);
 }
@@ -245 +245 @@
 
         //self->params.err = data;
-        self->params.nerr = ndata;
+        self->params.nerr = (int)ndata;
         return Py_BuildValue("i", self->params.nerr);
 }
@@ -523 +523 @@
     residuals = PyList_New(self->params.npoints);
 
-    regterm = reg_term(pars, self->params.d_max, npars, nslice);
+    regterm = reg_term(pars, self->params.d_max, (int)npars, nslice);
 
     for(i=0; i<self->params.npoints; i++) {
-        diff = self->params.y[i] - iq(pars, self->params.d_max, npars, self->params.x[i]);
+        diff = self->params.y[i] - iq(pars, self->params.d_max, (int)npars, self->params.x[i]);
         residual = diff*diff / (self->params.err[i]*self->params.err[i]);
 
@@ -573 +573 @@
     residuals = PyList_New(self->params.npoints);
 
-    regterm = reg_term(pars, self->params.d_max, npars, nslice);
+    regterm = reg_term(pars, self->params.d_max, (int)npars, nslice);
 
 
     for(i=0; i<self->params.npoints; i++) {
-        diff = self->params.y[i] - pr(pars, self->params.d_max, npars, self->params.x[i]);
+        diff = self->params.y[i] - pr(pars, self->params.d_max, (int)npars, self->params.x[i]);
         residual = diff*diff / (self->params.err[i]*self->params.err[i]);
 
@@ -611 +611 @@
         OUTVECTOR(data_obj,pars,npars);
 
-        iq_value = iq(pars, self->params.d_max, npars, q);
+        iq_value = iq(pars, self->params.d_max, (int)npars, q);
         return Py_BuildValue("f", iq_value);
 }
@@ -636 +636 @@
         OUTVECTOR(data_obj,pars,npars);
 
-        iq_value = iq_smeared(pars, self->params.d_max, npars,
+        iq_value = iq_smeared(pars, self->params.d_max, (int)npars,
                                                         self->params.slit_height, self->params.slit_width,
                                                         q, 21);
@@ -661 +661 @@
         OUTVECTOR(data_obj,pars,npars);
 
-        pr_value = pr(pars, self->params.d_max, npars, r);
+        pr_value = pr(pars, self->params.d_max, (int)npars, r);
         return Py_BuildValue("f", pr_value);
 }
@@ -689 +689 @@
 
         if (err_obj == Py_None) {
-                pr_value = pr(pars, self->params.d_max, npars, r);
+                pr_value = pr(pars, self->params.d_max, (int)npars, r);
                 pr_err_value = 0.0;
         } else {
                 OUTVECTOR(err_obj,pars_err,npars2);
-                pr_err(pars, pars_err, self->params.d_max, npars, r, &pr_value, &pr_err_value);
+                pr_err(pars, pars_err, self->params.d_max, (int)npars, r, &pr_value, &pr_err_value);
         }
         return Py_BuildValue("ff", pr_value, pr_err_value);
@@ -728 +728 @@
         OUTVECTOR(data_obj,pars,npars);
 
-        oscill = reg_term(pars, self->params.d_max, npars, 100);
-        norm   = int_p2(pars, self->params.d_max, npars, 100);
+        oscill = reg_term(pars, self->params.d_max, (int)npars, 100);
+        norm   = int_p2(pars, self->params.d_max, (int)npars, 100);
         return Py_BuildValue("f", sqrt(oscill/norm)/acos(-1.0)*self->params.d_max );
 
@@ -749 +749 @@
         OUTVECTOR(data_obj,pars,npars);
 
-        count = npeaks(pars, self->params.d_max, npars, 100);
+        count = npeaks(pars, self->params.d_max, (int)npars, 100);
 
         return Py_BuildValue("i", count );
@@ -770 +770 @@
         OUTVECTOR(data_obj,pars,npars);
 
-        fraction = positive_integral(pars, self->params.d_max, npars, 100);
+        fraction = positive_integral(pars, self->params.d_max, (int)npars, 100);
 
         return Py_BuildValue("f", fraction );
@@ -795 +795 @@
         OUTVECTOR(err_obj,pars_err,npars2);
 
-        fraction = positive_errors(pars, pars_err, self->params.d_max, npars, 51);
+        fraction = positive_errors(pars, pars_err, self->params.d_max, (int)npars, 51);
 
         return Py_BuildValue("f", fraction );
@@ -815 +815 @@
         OUTVECTOR(data_obj,pars,npars);
 
-        value = rg(pars, self->params.d_max, npars, 101);
+        value = rg(pars, self->params.d_max, (int)npars, 101);
 
         return Py_BuildValue("f", value );
@@ -835 +835 @@
         OUTVECTOR(data_obj,pars,npars);
 
-        value = 4.0*acos(-1.0)*int_pr(pars, self->params.d_max, npars, 101);
+        value = 4.0*acos(-1.0)*int_pr(pars, self->params.d_max, (int)npars, 101);
 
         return Py_BuildValue("f", value );

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -155 +155 @@
         """
         data_error = False
-        for error_data in item.errors:
+        if hasattr(item, 'errors'):
+            for error_data in item.errors:
+                data_error = True
+                message += "\tError: {0}\n".format(error_data)
+        else:
+            logging.error("Loader returned an invalid object:\n %s" % str(item))
             data_error = True
-            message += "\tError: {0}\n".format(error_data)
+        
         data = self.parent.create_gui_data(item, p_file)
         output[data.id] = data
@@ -203 +208 @@
                                                           error_message)
             except:
+                logging.error(sys.exc_value)
                 any_error = True
             if any_error or error_message != "":

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -30 +30 @@
 from wx.py.editwindow import EditWindow
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+from .pyconsole import show_model_output, check_model
 
 
@@ -45 +46 @@
 PANEL_WIDTH = 500
 _BOX_WIDTH = 55
-
-
-def _compile_file(path):
-    """
-    Compile the file in the path
-    """
-    try:
-        import py_compile
-        py_compile.compile(file=path, doraise=True)
-        return ''
-    except:
-        _, value, _ = sys.exc_info()
-        return value
 
 def _delete_file(path):
@@ -384 +372 @@
             name2 = label[1]
             self.write_string(fname, name1, name2)
-            self.compile_file(fname)
-            self.parent.update_custom_combo()
+            success = show_model_output(self, fname)
+            if success:
+                self.parent.update_custom_combo()
             msg = self._notes
             info = 'Info'
@@ -618 +607 @@
         """
         path = self.fname
-        _compile_file(path)
+        show_model_output(self, path)
 
     def delete_file(self, path):
@@ -954 +943 @@
         info = 'Info'
         msg = ''
+        result, check_err = '', ''
         # Sort out the errors if occur
         # First check for valid python name then if the name already exists
@@ -969 +959 @@
                     self.write_file(self.fname, name, description, param_str,
                                     pd_param_str, func_str)
+                    try:
+                        result, msg = check_model(self.fname), None
+                    except Exception:
+                        import traceback
+                        result, msg = None, "error building model"
+                        check_err = "\n"+traceback.format_exc(limit=2)
+
                     # Modified compiling test, as it will fail for sasmodels.sasview_model class
                     # Should add a test to check that the class is correctly built 
@@ -1031 +1028 @@
             color = 'red'
         else:
-            msg = "Successful! "
+            self._notes = result
+            msg = "Successful! Please look for %s in Customized Models."%name
             msg += "  " + self._notes
-            msg += " Please look for it in the Customized Models."
             info = 'Info'
             color = 'blue'
@@ -1041 +1038 @@
         if self.base != None:
             from sas.sasgui.guiframe.events import StatusEvent
-            wx.PostEvent(self.base.parent, StatusEvent(status=msg, info=info))
+            wx.PostEvent(self.base.parent,
+                         StatusEvent(status=msg+check_err, info=info))
         self.warning = msg
 
@@ -1333 +1331 @@
 import copy
 
-import nuympy
+import numpy
 
 from sas.sascalc.fit.pluginmodel import Model1DPlugin

src/sas/sasgui/perspectives/calculator/pyconsole.py

@@ -4 +4 @@
 import sys
 import os
+
+import numpy as np
+
 import wx
-import wx.lib.dialogs
+from wx.lib.dialogs import ScrolledMessageDialog
 import wx.py.editor as editor
-import wx.py.frame as frame
-import py_compile
 
 if sys.platform.count("win32") > 0:
@@ -18 +19 @@
     PANEL_HEIGHT = 730
     FONT_VARIANT = 1
-ID_COMPILE = wx.NewId()
+ID_CHECK_MODEL = wx.NewId()
 ID_RUN = wx.NewId()
 
-def compile_file(path):
+def check_model(path):
     """
-    Compile a python file
+    Check that the model on the path can run.
     """
+    # try running the model
+    from sasmodels.core import load_model, call_kernel
+    model = load_model(path)
+
+    q =  np.array([0.01, 0.1])
+    kernel = model.make_kernel([q])
+    Iq = call_kernel(kernel, {})
+
+    qx, qy =  np.array([0.01, 0.01]), np.array([0.1, 0.1])
+    kernel = model.make_kernel([qx, qy])
+    Iqxy = call_kernel(kernel, {})
+
+    result = """
+    Iq(%s) = %s
+    Iqxy(%s, %s) = %s
+    """%(q, Iq, qx, qy, Iqxy)
+
+    return result
+
+def show_model_output(parent, fname):
+    # Make sure we have a python file; not sure why we care though...
+    if not (fname and os.path.exists(fname) and fname.endswith('.py')):
+        mssg = "\n This is not a python file."
+        wx.MessageBox(str(mssg), 'Error', style=wx.ICON_ERROR)
+        return False
+
     try:
-        import py_compile
-        py_compile.compile(file=path, doraise=True)
-    except:
-        type, value, traceback = sys.exc_info()
-        return value
-    return None
+        result, errmsg = check_model(fname), None
+    except Exception:
+        import traceback
+        result, errmsg = None, traceback.format_exc(limit=2)
+
+    parts = ["Running model '%s'..." % os.path.basename(fname)]
+    if errmsg is not None:
+        parts.extend(["", "Error occurred:", errmsg, ""])
+        title, icon = "Error", wx.ICON_ERROR
+    else:
+        parts.extend(["", "Success:", result, ""])
+        title, icon = "Info", wx.ICON_INFORMATION
+    text = "\n".join(parts)
+    dlg = ScrolledMessageDialog(parent, text, title, size=((550, 250)))
+    fnt = wx.Font(10, wx.TELETYPE, wx.NORMAL, wx.NORMAL)
+    dlg.GetChildren()[0].SetFont(fnt)
+    dlg.GetChildren()[0].SetInsertionPoint(0)
+    dlg.ShowModal()
+    dlg.Destroy()
+    return errmsg is None
 
 class PyConsole(editor.EditorNotebookFrame):
@@ -65 +106 @@
         self.Bind(wx.EVT_MENU, self.OnSaveFile, id=wx.ID_SAVE)
         self.Bind(wx.EVT_MENU, self.OnSaveAsFile, id=wx.ID_SAVEAS)
-        self.Bind(wx.EVT_MENU, self.OnCompile, id=ID_COMPILE)
+        self.Bind(wx.EVT_MENU, self.OnCheckModel, id=ID_CHECK_MODEL)
         self.Bind(wx.EVT_MENU, self.OnRun, id=ID_RUN)
-        self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateCompileMenu, id=ID_COMPILE)
+        self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateCompileMenu, id=ID_CHECK_MODEL)
         self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateCompileMenu, id=ID_RUN)
         self.Bind(wx.EVT_CLOSE, self.on_close)
@@ -81 +122 @@
         """
         self.compileMenu = wx.Menu()
-        self.compileMenu.Append(ID_COMPILE, 'Compile',
-                 'Compile the file')
+        self.compileMenu.Append(ID_CHECK_MODEL, 'Check model',
+                 'Loading and run the model')
         self.compileMenu.AppendSeparator()
         self.compileMenu.Append(ID_RUN, 'Run in Shell',
@@ -192 +233 @@
         Run
         """
-        if self._check_changed():
+        if not self._check_saved():
             return True
         if self.buffer and self.buffer.doc.filepath:
@@ -207 +248 @@
             icon = wx.ICON_ERROR
             wx.MessageBox(str(mssg), title, style=icon)
-            return 0
-
-    def OnCompile(self, event):
+            return False
+
+    def OnCheckModel(self, event):
         """
         Compile
         """
-        if self._check_changed():
+        if not self._check_saved():
             return True
-        run_out = self.OnRun(None)
-        if self._get_err_msg(run_out):
-            if self._manager != None and self.panel != None:
-                self._manager.set_edit_menu_helper(self.parent)
-                # Update custom model list in fitpage combobox
-                wx.CallAfter(self._manager.update_custom_combo)
-
-    def _check_changed(self):
+        fname = self.editor.getStatus()[0]
+        success = show_model_output(self, fname)
+
+        # Update custom model list in fitpage combobox
+        if success and self._manager != None and self.panel != None:
+            self._manager.set_edit_menu_helper(self.parent)
+            wx.CallAfter(self._manager.update_custom_combo)
+
+    def _check_saved(self):
         """
         If content was changed, suggest to save it first
@@ -228 +270 @@
         if self.bufferHasChanged() and self.buffer.doc.filepath:
             cancel = self.bufferSuggestSave()
-            if cancel:
-                return cancel
-
-    def _get_err_msg(self, text=''):
-        """
-        Get err_msg
-        """
-        name = None
-        mssg = "\n This is not a python file."
-        title = 'Error'
-        icon = wx.ICON_ERROR
-        try:
-            fname = self.editor.getStatus()[0]
-            name = os.path.basename(fname)
-            if name.split('.')[-1] != 'py':
-                wx.MessageBox(str(mssg), title, style=icon)
-                return False
-            msg = compile_file(fname)
-        except:
-            msg = None
-        if name == None:
-            wx.MessageBox(str(mssg), title, style=icon)
-            return False
-        mssg = "Compiling '%s'...\n" % name
-        if msg != None:
-            mssg += "Error occurred:\n"
-            mssg += str(msg) + "\n\n"
-            if text:
-                mssg += "Run-Test results:\n"
-                mssg += str(text)
-                title = 'Warning'
-                icon = wx.ICON_WARNING
-        else:
-            mssg += "Successful.\n\n"
-            if text:
-                if text.count('Failed') or text.count('Error:') > 0:
-                    mssg += "But Simple Test FAILED: Please check your code.\n"
-                mssg += "Run-Test results:\n"
-                mssg += str(text)
-            title = 'Info'
-            icon = wx.ICON_INFORMATION
-        dlg = wx.lib.dialogs.ScrolledMessageDialog(self, mssg, title,
-                                                   size=((550, 250)))
-        fnt = wx.Font(10, wx.TELETYPE, wx.NORMAL, wx.NORMAL)
-        dlg.GetChildren()[0].SetFont(fnt)
-        dlg.GetChildren()[0].SetInsertionPoint(0)
-        dlg.ShowModal()
-        dlg.Destroy()
+            return not cancel
         return True
 
@@ -286 +281 @@
         event.Enable(True)
         try:
-            if id == ID_COMPILE or id == ID_RUN:
+            if id == ID_CHECK_MODEL or id == ID_RUN:
                 menu_on = False
                 if self.buffer and self.buffer.doc.filepath:

src/sas/sasgui/perspectives/fitting/__init__.py

@@ -39 +39 @@
     data_files = []
     path = os.path.dirname(__file__)
-    # p_path = os.path.join(path, 'plugin_models')
-    # for f in findall(p_path):
-    #     data_files.append(('plugin_models', [f]))
+    p_path = os.path.join(path, 'plugin_models')
+    for f in findall(p_path):
+        data_files.append(('plugin_models', [f]))
     # path = get_data_path(media="media")
     for f in findall(path):

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -1330 +1330 @@
                                               qmin=float(self.qmin_x),
                                               qmax=float(self.qmax_x),
-                                              enable_smearer=enable_smearer,
-                                              draw=True)
+                                              enable_smearer=enable_smearer)
                 if flag:
                     #self.compute_chisqr(smearer= temp_smearer)
@@ -2606 +2605 @@
                      qmin=float(self.qmin_x),
                      qmax=float(self.qmax_x),
-                     enable_smearer=enable_smearer,
-                     draw=True)
+                     enable_smearer=enable_smearer)
 
         self.state.enable_smearer = self.enable_smearer.GetValue()

src/sas/sasgui/perspectives/fitting/fitpanel.py

@@ -17 +17 @@
 import models
 _BOX_WIDTH = 80
-
 
 class FitPanel(nb, PanelBase):
@@ -154 +153 @@
         """
         """
-        from bumps.options import FIT_CONFIG
-        current = FIT_CONFIG.selected_name
-        self.parent.SetTitle(self.window_name + " - Active Fitting Optimizer: " + current)
         pos = self.GetSelection()
         if pos != -1:

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -19 +19 @@
 import time
 from copy import deepcopy
-import models
+import traceback
 
 from sas.sascalc.dataloader.loader import Loader
@@ -46 +46 @@
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 
+from . import models
+
 MAX_NBR_DATA = 4
 
@@ -56 +58 @@
     ON_MAC = True
 
-
+import bumps.options
+from bumps.gui.fit_dialog import show_fit_config
+try:
+    from bumps.gui.fit_dialog import EVT_FITTER_CHANGED
+except ImportError:
+    # CRUFT: bumps 0.7.5.8 and below
+    EVT_FITTER_CHANGED = None  # type: wx.PyCommandEvent
 
 class Plugin(PluginBase):
@@ -254 +262 @@
                 msg += "and try it again."
                 wx.MessageBox(msg, 'Info')
-                #wx.PostEvent(self.parent, StatusEvent(status=msg, type='stop',
-                #                                      info='warning'))
+                #evt = StatusEvent(status=msg, type='stop', info='warning')
+                #wx.PostEvent(self.parent, evt)
             else:
                 self.delete_menu.Delete(event_id)
@@ -262 +270 @@
                         self.edit_menu.DeleteItem(item)
                         msg = "The custom model, %s, has been deleted." % label
-                        wx.PostEvent(self.parent, StatusEvent(status=msg,
-                                                type='stop', info='info'))
+                        evt = StatusEvent(status=msg, type='stop', info='info')
+                        wx.PostEvent(self.parent, evt)
                         break
         except:
@@ -501 +509 @@
         self.parent.Bind(EVT_SLICER_PANEL, self._on_slicer_event)
         self.parent.Bind(EVT_SLICER_PARS_UPDATE, self._onEVT_SLICER_PANEL)
+
+        # CRUFT: EVT_FITTER_CHANGED is not None for bumps 0.7.5.9 and above
+        if EVT_FITTER_CHANGED is not None:
+            self.parent.Bind(EVT_FITTER_CHANGED, self.on_fitter_changed)
+        self._set_fitter_label(bumps.options.FIT_CONFIG)
+
         #self.parent._mgr.Bind(wx.aui.EVT_AUI_PANE_CLOSE,self._onclearslicer)
         #Create reader when fitting panel are created
@@ -567 +581 @@
             except:
                 msg = "Fitting: cannot deal with the theory received"
+                evt = StatusEvent(status=msg, info="error")
                 logging.error("set_theory " + msg + "\n" + str(sys.exc_value))
-                wx.PostEvent(self.parent,
-                             StatusEvent(status=msg, info="error"))
+                wx.PostEvent(self.parent, evt)
 
     def set_state(self, state=None, datainfo=None, format=None):
@@ -763 +777 @@
         Open the bumps options panel.
         """
-        try:
-            from bumps.gui.fit_dialog import show_fit_config
-            show_fit_config(self.parent, help=self.on_help)
-        except ImportError:
-            # CRUFT: Bumps 0.7.5.6 and earlier do not have the help button
-            from bumps.gui.fit_dialog import OpenFitOptions
-            OpenFitOptions()
+        show_fit_config(self.parent, help=self.on_help)
+
+    def on_fitter_changed(self, event):
+        self._set_fitter_label(event.config)
+
+    def _set_fitter_label(self, config):
+        self.fit_panel.parent.SetTitle(self.fit_panel.window_name
+                                       + " - Active Fitting Optimizer: "
+                                       + config.selected_name)
 
     def on_help(self, algorithm_id):
@@ -954 +970 @@
                     if not page.param_toFit:
                         msg = "No fitting parameters for %s" % page.window_caption
-                        wx.PostEvent(page.parent.parent,
-                                     StatusEvent(status=msg, info="error",
-                                                 type="stop"))
+                        evt = StatusEvent(status=msg, info="error", type="stop")
+                        wx.PostEvent(page.parent.parent, evt)
                         return False
                     if not page._update_paramv_on_fit():
@@ -962 +977 @@
                         msg += " invalid in %s" % \
                                     page.window_caption
-                        wx.PostEvent(page.parent.parent,
-                                     StatusEvent(status=msg, info="error",
-                                     type="stop"))
+                        evt = StatusEvent(status=msg, info="error", type="stop")
+                        wx.PostEvent(page.parent.parent, evt)
                         return False
 
@@ -985 +999 @@
             except KeyboardInterrupt:
                 msg = "Fitting terminated"
-                wx.PostEvent(self.parent, StatusEvent(status=msg, info="info",
-                                                      type="stop"))
+                evt = StatusEvent(status=msg, info="info", type="stop")
+                wx.PostEvent(self.parent, evt)
                 return True
             except:
                 raise
                 msg = "Fitting error: %s" % str(sys.exc_value)
-                wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",
-                                                      type="stop"))
+                evt = StatusEvent(status=msg, info="error", type="stop")
+                wx.PostEvent(self.parent, evt)
                 return False
         ## If a thread is already started, stop it
@@ -1087 +1101 @@
             # add data associated to the page created
             if page != None:
-                wx.PostEvent(self.parent, StatusEvent(status="Page Created",
-                                               info="info"))
+                evt = StatusEvent(status="Page Created", info="info")
+                wx.PostEvent(self.parent, evt)
             else:
                 msg = "Page was already Created"
-                wx.PostEvent(self.parent, StatusEvent(status=msg,
-                                                       info="warning"))
+                evt = StatusEvent(status=msg, info="warning")
+                wx.PostEvent(self.parent, evt)
         except:
             msg = "Creating Fit page: %s" % sys.exc_value
@@ -1254 +1268 @@
         msg = "Fit completed on %s \n" % str_time
         msg += "Duration time: %s s.\n" % str(elapsed)
-        wx.PostEvent(self.parent, StatusEvent(status=msg, info="info",
-                                              type="stop"))
+        evt = StatusEvent(status=msg, info="info", type="stop")
+        wx.PostEvent(self.parent, evt)
 
         if batch_outputs is None:
@@ -1405 +1419 @@
                                          batch_inputs=batch_inputs)
 
-        wx.PostEvent(self.parent, StatusEvent(status=msg, error="info",
-                                              type="stop"))
+        evt = StatusEvent(status=msg, error="info", type="stop")
+        wx.PostEvent(self.parent, evt)
         # Remove parameters that are not shown
         cpage = self.fit_panel.get_page_by_id(uid)
@@ -1485 +1499 @@
         msg = "Fit completed on %s \n" % str_time
         msg += "Duration time: %s s.\n" % str(elapsed)
-        wx.PostEvent(self.parent, StatusEvent(status=msg, info="info",
-                                                      type="stop"))
+        evt = StatusEvent(status=msg, info="info", type="stop")
+        wx.PostEvent(self.parent, evt)
         wx.PostEvent(self.result_panel, PlotResultEvent(result=result))
         wx.CallAfter(self._update_fit_button, page_id)
@@ -1510 +1524 @@
                     not numpy.all(numpy.isfinite(res.pvec)):
                     msg = "Fitting did not converge!!!"
-                    wx.PostEvent(self.parent,
-                             StatusEvent(status=msg,
-                                         info="warning",
-                                         type="stop"))
+                    evt = StatusEvent(status=msg, info="warning", type="stop")
+                    wx.PostEvent(self.parent, evt)
                     wx.CallAfter(self._update_fit_button, page_id)
                 else:
@@ -1537 +1549 @@
                     except KeyboardInterrupt:
                         msg = "Singular point: Fitting Stoped."
-                        wx.PostEvent(self.parent, StatusEvent(status=msg,
-                                                              info="info",
-                                                              type="stop"))
+                        evt = StatusEvent(status=msg, info="info", type="stop")
+                        wx.PostEvent(self.parent, evt)
                     except:
                         msg = "Singular point: Fitting Error occurred."
-                        wx.PostEvent(self.parent, StatusEvent(status=msg,
-                                                              info="error",
-                                                              type="stop"))
+                        evt = StatusEvent(status=msg, info="error", type="stop")
+                        wx.PostEvent(self.parent, evt)
 
         except:
@@ -1550 +1560 @@
                    % sys.exc_value)
             #import traceback; msg = "\n".join((traceback.format_exc(), msg))
-            wx.PostEvent(self.parent, StatusEvent(status=msg, info="warning",
-                                                  type="stop"))
+            evt = StatusEvent(status=msg, info="warning", type="stop")
+            wx.PostEvent(self.parent, evt)
 
     def _update_fit_button(self, page_id):
@@ -1588 +1598 @@
         ## post a message to status bar
         msg = "Set Chain Fitting: %s" % str(not self.batch_reset_flag)
-        wx.PostEvent(self.parent,
-                     StatusEvent(status=msg))
+        wx.PostEvent(self.parent, StatusEvent(status=msg))
 
 
@@ -1735 +1744 @@
             raise
 
+    def _calc_exception(self, etype, value, tb):
+        """
+        Handle exception from calculator by posting it as an error.
+        """
+        logging.error("".join(traceback.format_exception(etype, value, tb)))
+        msg = traceback.format_exception(etype, value, tb, limit=1)
+        evt = StatusEvent(status="".join(msg), type="stop", info="error")
+        wx.PostEvent(self.parent, evt)
+
     def _update2D(self, output, time=None):
         """
         Update the output of plotting model
         """
-        wx.PostEvent(self.parent, StatusEvent(status="Plot \
-        #updating ... ", type="update"))
-        #self.ready_fit()
+        msg = "Plot updating ... "
+        wx.PostEvent(self.parent, StatusEvent(msg, type="update"))
 
     def _complete2D(self, image, data, model, page_id, elapsed, index, qmin,
@@ -1847 +1864 @@
                     time.sleep(0.1)
             self.calc_2D = Calc2D(model=model,
-                                    data=data,
-                                    page_id=page_id,
-                                    smearer=smearer,
-                                    qmin=qmin,
-                                    qmax=qmax,
-                                    weight=weight,
-                                    fid=fid,
-                                    toggle_mode_on=toggle_mode_on,
-                                    state=state,
-                                    completefn=self._complete2D,
-                                    update_chisqr=update_chisqr, source=source)
+                                  data=data,
+                                  page_id=page_id,
+                                  smearer=smearer,
+                                  qmin=qmin,
+                                  qmax=qmax,
+                                  weight=weight,
+                                  fid=fid,
+                                  toggle_mode_on=toggle_mode_on,
+                                  state=state,
+                                  completefn=self._complete2D,
+                                  update_chisqr=update_chisqr,
+                                  exception_handler=self._calc_exception,
+                                  source=source)
             self.calc_2D.queue()
         except:
@@ -1912 +1931 @@
                                   #updatefn = self._update1D,
                                   update_chisqr=update_chisqr,
+                                  exception_handler=self._calc_exception,
                                   source=source)
             self.calc_1D.queue()

src/sas/sasgui/perspectives/fitting/model_thread.py

@@ -25 +25 @@
                  source='model',
                  yieldtime=0.04,
-                 worktime=0.04
+                 worktime=0.04,
+                 exception_handler=None,
                  ):
-        CalcThread.__init__(self, completefn, updatefn, yieldtime, worktime)
+        CalcThread.__init__(self, completefn, updatefn, yieldtime, worktime,
+                            exception_handler=exception_handler)
         self.qmin = qmin
         self.qmax = qmax
@@ -133 +135 @@
                  updatefn=None,
                  yieldtime=0.01,
-                 worktime=0.01
+                 worktime=0.01,
+                 exception_handler=None,
                  ):
         """
         """
-        CalcThread.__init__(self, completefn,
-                 updatefn,
-                 yieldtime,
-                 worktime)
+        CalcThread.__init__(self, completefn, updatefn, yieldtime, worktime,
+                            exception_handler=exception_handler)
         self.fid = fid
         self.data = data

src/sas/sasgui/perspectives/invariant/media/invariant_help.rst

@@ -19 +19 @@
 .. image:: image001.gif
 
-where *g = Q* for pinhole geometry (SAS) and *g = Qv* (the slit height) for  
+where *g = q* for pinhole geometry (SAS) and *g = q*\ :sub:`v` (the slit height) for  
 slit geometry (USAS).
 

src/sas/sasgui/plottools/plottables.py

@@ -704 +704 @@
             else:
                 self.dy = None
-            tempx = []
-            tempy = []
             if not has_err_x:
                 dx = numpy.zeros(len(x))
@@ -724 +722 @@
                     if has_err_y:
                         self.dy.append(tempdy)
-                except:
-                    tempx = x[i]
-                    tempy = y[i]
-                    tempdy = dy[i]
+                except Exception:
+                    pass
             # Sanity check
             if not len(self.x) == len(self.y):
@@ -733 +729 @@
                 msg += "and y are not of the same length"
                 raise ValueError, msg
-            if has_err_x and not (len(self.x) and len(self.dx)):
+            if has_err_x and not (len(self.x) == len(self.dx)):
                 msg = "Plottable.View: transformed x and dx"
                 msg += " are not of the same length"
                 raise ValueError, msg
-            if has_err_y and not (len(self.y) and len(self.dy)):
+            if has_err_y and not (len(self.y) == len(self.dy)):
                 msg = "Plottable.View: transformed y"
                 msg += " and dy are not of the same length"

src/sas/sasgui/perspectives/fitting/models.py

@@ -147 +147 @@
     try:
         import compileall
-        compileall.compile_dir(dir=dir, ddir=dir, force=1,
+        compileall.compile_dir(dir=dir, ddir=dir, force=0,
                                quiet=report_problem)
     except: