Changeset 3c6ecd9 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

May 7, 2018 4:47:21 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

42787fb

Parents:

b0ba43e (diff), 80468f6 (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 'ESS_GUI' into ESS_GUI_Pr

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ComplexConstraint.py (modified) (1 diff)
• ConstraintWidget.py (modified) (2 diffs)
• FittingLogic.py (modified) (1 diff, 1 prop)
• FittingOptions.py (modified) (1 diff)
• FittingUtilities.py (modified) (3 diffs)
• FittingWidget.py (modified) (27 diffs)
• GPUOptions.py (modified) (1 diff)
• ModelThread.py (modified) (3 diffs)
• ModelUtilities.py (modified) (1 diff)
• MultiConstraint.py (modified) (1 diff)
• UI/FittingWidgetUI.ui (modified) (1 diff)
• UnitTesting/ConstraintWidgetTest.py (modified) (1 diff)
• UnitTesting/FittingLogicTest.py (modified) (2 diffs)
• UnitTesting/FittingPerspectiveTest.py (modified) (3 diffs)
• UnitTesting/FittingWidgetTest.py (modified) (9 diffs)
• media/ball.ico (moved) (moved from src/sas/sasgui/perspectives/fitting/media/ball.ico) (1 prop)
• media/batch_button_area.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/batch_button_area.png) (1 prop)
• media/cat_fig0.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/cat_fig0.png) (1 prop)
• media/cat_fig1.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/cat_fig1.png) (1 prop)
• media/cat_fig2.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/cat_fig2.png) (1 prop)
• media/combine_batch_grid.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png) (1 prop)
• media/combine_batch_page.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png) (1 prop)
• media/combine_batch_plot.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png) (1 prop)
• media/edit_menu.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/edit_menu.png) (1 prop)
• media/edit_model_menu.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/edit_model_menu.png) (1 prop)
• media/file_menu.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/file_menu.png) (1 prop)
• media/fitting.rst (moved) (moved from src/sas/sasgui/perspectives/fitting/media/fitting.rst) (1 prop)
• media/fitting_help.rst (moved) (moved from src/sas/sasgui/perspectives/fitting/media/fitting_help.rst) (1 prop)
• media/new_model.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/new_model.png) (1 prop)
• media/plot_button.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/plot_button.png) (1 prop)
• media/residuals_help.rst (moved) (moved from src/sas/sasgui/perspectives/fitting/media/residuals_help.rst) (1 prop)
• media/restore_batch_window.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png) (1 prop)
• media/sum_model.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/sum_model.png) (1 prop)
• media/view_button.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/view_button.png) (1 prop)
• media/view_data_model.png (moved) (moved from src/sas/sasgui/perspectives/fitting/media/view_data_model.png) (1 prop)

src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py

@@ -202 +202 @@
         try:
             help_location = GuiUtils.HELP_DIRECTORY_LOCATION + \
-            "/user/sasgui/perspectives/fitting/fitting_help.html#simultaneous-fits-with-constraints"
+            "/user/qtgui/Perspectives/Fitting/fitting_help.html#simultaneous-fits-with-constraints"
             webbrowser.open('file://' + os.path.realpath(help_location))
         except AttributeError:

src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

@@ -230 +230 @@
         Show the "Fitting" section of help
         """
-        tree_location = "/user/sasgui/perspectives/fitting/"
+        tree_location = "/user/qtgui/Perspectives/Fitting/"
 
         helpfile = "fitting_help.html#simultaneous-fit-mode"
@@ -358 +358 @@
         elapsed = result[1]
 
-        # ADD THE BATCH FIT VIEW HERE
-        #
+        if result is None:
+            msg = "Fitting failed."
+            self.parent.communicate.statusBarUpdateSignal.emit(msg)
+            return
+
+        # Show the grid panel
+        self.parent.communicate.sendDataToGridSignal.emit(result[0])
 
         msg = "Fitting completed successfully in: %s s.\n" % GuiUtils.formatNumber(elapsed)

src/sas/qtgui/Perspectives/Fitting/FittingLogic.py

@@ -126 +126 @@
 
         new_plot.group_id = data.group_id
-        new_plot.id = str(tab_id) + " " + data.name
-        new_plot.name = model.name + " [" + data.name + "]"
+        new_plot.id = str(tab_id) + " " + model.id
+
+        if data.filename:
+            new_plot.name = model.name + " [" + data.filename + "]" # data file
+        else:
+            new_plot.name = model.name + " [" + model.id + "]"  # theory
+
         new_plot.title = new_plot.name
         new_plot.xaxis(_xaxis, _xunit)

src/sas/qtgui/Perspectives/Fitting/FittingOptions.py

@@ -158 +158 @@
         """
         tree_location = GuiUtils.HELP_DIRECTORY_LOCATION
-        tree_location += "/user/sasgui/perspectives/fitting/"
+        tree_location += "/user/qtgui/Perspectives/Fitting/"
 
         # Actual file anchor will depend on the combo box index

src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

@@ -68 +68 @@
     multishell_parameters = getIterParams(parameters)
     multishell_param_name, _ = getMultiplicity(parameters)
-    params = parameters.iqxy_parameters if is2D else parameters.iq_parameters
+    if is2D:
+        params = [p for p in parameters.kernel_parameters if p.type != 'magnetic']
+    else:
+        params = parameters.iq_parameters
     item = []
     for param in params:
@@ -125 +128 @@
     Update local ModelModel with sasmodel parameters
     """
-    params = parameters.iqxy_parameters if is2D else parameters.iq_parameters
+    if is2D:
+        params = [p for p in parameters.kernel_parameters if p.type != 'magnetic']
+    else:
+        params = parameters.iq_parameters
     item = []
     for param in params:
@@ -421 +427 @@
         weight = numpy.abs(data)
     return weight
+
+def updateKernelWithResults(kernel, results):
+    """
+    Takes model kernel and applies results dict to its parameters,
+    returning the modified (deep) copy of the kernel.
+    """
+    assert(isinstance(results, dict))
+    local_kernel = copy.deepcopy(kernel)
+
+    for parameter in results.keys():
+        # Update the parameter value - note: this supports +/-inf as well
+        local_kernel.setParam(parameter, results[parameter][0])
+
+    return local_kernel
+
+

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -3 +3 @@
 from collections import defaultdict
 
-
+import copy
 import logging
 import traceback
@@ -24 +24 @@
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 import sas.qtgui.Utilities.LocalConfig as LocalConfig
-from sas.qtgui.Utilities.GridPanel import BatchOutputPanel
 from sas.qtgui.Utilities.CategoryInstaller import CategoryInstaller
 from sas.qtgui.Plotting.PlotterData import Data1D
@@ -88 +87 @@
     fittingFinishedSignal = QtCore.pyqtSignal(tuple)
     batchFittingFinishedSignal = QtCore.pyqtSignal(tuple)
+    Calc1DFinishedSignal = QtCore.pyqtSignal(tuple)
+    Calc2DFinishedSignal = QtCore.pyqtSignal(tuple)
 
     def __init__(self, parent=None, data=None, tab_id=1):
@@ -99 +100 @@
         self.tab_id = tab_id
 
-        # Main Data[12]D holder
-        self.logic = FittingLogic()
-
         # Globals
         self.initializeGlobals()
@@ -107 +105 @@
         # Set up desired logging level
         logging.disable(LocalConfig.DISABLE_LOGGING)
+
+        # data index for the batch set
+        self.data_index = 0
+        # Main Data[12]D holders
+        # Logics.data contains a single Data1D/Data2D object
+        self._logic = [FittingLogic()]
 
         # Main GUI setup up
@@ -134 +138 @@
         self.initializeControls()
 
-        # Display HTML content
-        #self.setupHelp()
+        if data is not None:
+            self.data = data
 
         # New font to display angstrom symbol
@@ -142 +146 @@
         self.label_19.setStyleSheet(new_font)
 
-        self._index = None
-        if data is not None:
-            self.data = data
+    @property
+    def logic(self):
+        # make sure the logic contains at least one element
+        assert(self._logic)
+        # logic connected to the currently shown data
+        return self._logic[self.data_index]
 
     @property
@@ -161 +168 @@
 
         assert isinstance(value[0], QtGui.QStandardItem)
-        # _index contains the QIndex with data
-        self._index = value[0]
 
         # Keep reference to all datasets for batch
         self.all_data = value
 
-        # Update logics with data items
+        # Create logics with data items
+        self._logic=[]
         # Logics.data contains only a single Data1D/Data2D object
-        self.logic.data = GuiUtils.dataFromItem(value[0])
+        for data_item in value:
+            self._logic.append(FittingLogic())
+            self._logic[-1].data = GuiUtils.dataFromItem(data_item)
 
         # Overwrite data type descriptor
@@ -191 +199 @@
         self.is_batch_fitting = False
         self.is_chain_fitting = False
+        # Is the fit job running?
+        self.fit_started=False
+        # The current fit thread
+        self.calc_fit = None
         # Current SasModel in view
         self.kernel_module = None
@@ -222 +234 @@
         # Polydisp widget table default index for function combobox
         self.orig_poly_index = 3
+        # copy of current kernel model
+        self.kernel_module_copy = None
 
         # Page id for fitting
@@ -484 +498 @@
         self.batchFittingFinishedSignal.connect(self.batchFitComplete)
         self.fittingFinishedSignal.connect(self.fitComplete)
+        self.Calc1DFinishedSignal.connect(self.complete1D)
+        self.Calc2DFinishedSignal.connect(self.complete2D)
 
         # Signals from separate tabs asking for replot
@@ -926 +942 @@
         Update the logic based on the selected file in batch fitting
         """
-        self._index = self.all_data[data_index]
-        self.logic.data = GuiUtils.dataFromItem(self.all_data[data_index])
+        self.data_index = data_index
         self.updateQRange()
 
@@ -1165 +1180 @@
         Show the "Fitting" section of help
         """
-        tree_location = "/user/sasgui/perspectives/fitting/"
+        tree_location = "/user/qtgui/Perspectives/Fitting/"
 
         # Actual file will depend on the current tab
@@ -1200 +1215 @@
         Perform fitting on the current data
         """
+        if self.fit_started:
+            self.stopFit()
+            return
+
         # initialize fitter constants
         fit_id = 0
@@ -1223 +1242 @@
             return
 
+        # keep local copy of kernel parameters, as they will change during the update
+        self.kernel_module_copy = copy.deepcopy(self.kernel_module)
+
         # Create the fitting thread, based on the fitter
         completefn = self.batchFittingCompleted if self.is_batch_fitting else self.fittingCompleted
 
-        calc_fit = FitThread(handler=handler,
+        self.calc_fit = FitThread(handler=handler,
                             fn=fitters,
                             batch_inputs=batch_inputs,
@@ -1237 +1259 @@
         if LocalConfig.USING_TWISTED:
             # start the trhrhread with twisted
-            calc_thread = threads.deferToThread(calc_fit.compute)
+            calc_thread = threads.deferToThread(self.calc_fit.compute)
             calc_thread.addCallback(completefn)
             calc_thread.addErrback(self.fitFailed)
         else:
             # Use the old python threads + Queue
-            calc_fit.queue()
-            calc_fit.ready(2.5)
+            self.calc_fit.queue()
+            self.calc_fit.ready(2.5)
 
         self.communicate.statusBarUpdateSignal.emit('Fitting started...')
+        self.fit_started = True
         # Disable some elements
         self.setFittingStarted()
 
+    def stopFit(self):
+        """
+        Attempt to stop the fitting thread
+        """
+        if self.calc_fit is None or not self.calc_fit.isrunning():
+            return
+        self.calc_fit.stop()
+        #self.fit_started=False
+        #re-enable the Fit button
+        self.setFittingStopped()
+
+        msg = "Fitting cancelled."
+        self.communicate.statusBarUpdateSignal.emit(msg)
+
     def updateFit(self):
         """
@@ -1258 +1295 @@
         """
         """
-        print("FIT FAILED: ", reason)
-        pass
+        self.setFittingStopped()
+        msg = "Fitting failed with: "+ str(reason)
+        self.communicate.statusBarUpdateSignal.emit(msg)
 
     def batchFittingCompleted(self, result):
@@ -1270 +1308 @@
         """
         Receive and display batch fitting results
-        """
-        #re-enable the Fit button
-        self.setFittingStopped()
-        # Show the grid panel
-        self.grid_window = BatchOutputPanel(parent=self, output_data=result[0])
-        self.grid_window.show()
-
-    def fittingCompleted(self, result):
-        """
-        Send the finish message from calculate threads to main thread
-        """
-        self.fittingFinishedSignal.emit(result)
-
-    def fitComplete(self, result):
-        """
-        Receive and display fitting results
-        "result" is a tuple of actual result list and the fit time in seconds
         """
         #re-enable the Fit button
@@ -1296 +1317 @@
             return
 
-        res_list = result[0][0]
-        res = res_list[0]
-        if res.fitness is None or \
-            not np.isfinite(res.fitness) or \
-            np.any(res.pvec is None) or \
-            not np.all(np.isfinite(res.pvec)):
-            msg = "Fitting did not converge!"
-            self.communicate.statusBarUpdateSignal.emit(msg)
-            msg += res.mesg
-            logging.error(msg)
-            return
+        # Show the grid panel
+        self.communicate.sendDataToGridSignal.emit(result[0])
 
         elapsed = result[1]
@@ -1312 +1324 @@
         self.communicate.statusBarUpdateSignal.emit(msg)
 
-        self.chi2 = res.fitness
-        param_list = res.param_list # ['radius', 'radius.width']
-        param_values = res.pvec     # array([ 0.36221662,  0.0146783 ])
-        param_stderr = res.stderr   # array([ 1.71293015,  1.71294233])
+        # Run over the list of results and update the items
+        for res_index, res_list in enumerate(result[0]):
+            # results
+            res = res_list[0]
+            param_dict = self.paramDictFromResults(res)
+
+            # create local kernel_module
+            kernel_module = FittingUtilities.updateKernelWithResults(self.kernel_module, param_dict)
+            # pull out current data
+            data = self._logic[res_index].data
+
+            # Switch indexes
+            self.onSelectBatchFilename(res_index)
+
+            method = self.complete1D if isinstance(self.data, Data1D) else self.complete2D
+            self.calculateQGridForModelExt(data=data, model=kernel_module, completefn=method, use_threads=False)
+
+        # Restore original kernel_module, so subsequent fits on the same model don't pick up the new params
+        if self.kernel_module is not None:
+            self.kernel_module = copy.deepcopy(self.kernel_module_copy)
+
+    def paramDictFromResults(self, results):
+        """
+        Given the fit results structure, pull out optimized parameters and return them as nicely
+        formatted dict
+        """
+        if results.fitness is None or \
+            not np.isfinite(results.fitness) or \
+            np.any(results.pvec is None) or \
+            not np.all(np.isfinite(results.pvec)):
+            msg = "Fitting did not converge!"
+            self.communicate.statusBarUpdateSignal.emit(msg)
+            msg += results.mesg
+            logging.error(msg)
+            return
+
+        param_list = results.param_list # ['radius', 'radius.width']
+        param_values = results.pvec     # array([ 0.36221662,  0.0146783 ])
+        param_stderr = results.stderr   # array([ 1.71293015,  1.71294233])
         params_and_errors = list(zip(param_values, param_stderr))
         param_dict = dict(zip(param_list, params_and_errors))
+
+        return param_dict
+
+    def fittingCompleted(self, result):
+        """
+        Send the finish message from calculate threads to main thread
+        """
+        self.fittingFinishedSignal.emit(result)
+
+    def fitComplete(self, result):
+        """
+        Receive and display fitting results
+        "result" is a tuple of actual result list and the fit time in seconds
+        """
+        #re-enable the Fit button
+        self.setFittingStopped()
+
+        if result is None:
+            msg = "Fitting failed."
+            self.communicate.statusBarUpdateSignal.emit(msg)
+            return
+
+        res_list = result[0][0]
+        res = res_list[0]
+        self.chi2 = res.fitness
+        param_dict = self.paramDictFromResults(res)
+
+        elapsed = result[1]
+        if self.calc_fit._interrupting:
+            msg = "Fitting cancelled by user after: %s s." % GuiUtils.formatNumber(elapsed)
+            logging.warning("\n"+msg+"\n")
+        else:
+            msg = "Fitting completed successfully in: %s s." % GuiUtils.formatNumber(elapsed)
+        self.communicate.statusBarUpdateSignal.emit(msg)
 
         # Dictionary of fitted parameter: value, error
@@ -1957 +2038 @@
             self.updateModelIndex(fitted_data)
         else:
-            name = self.nameForFittedData(self.kernel_module.name)
+            name = self.nameForFittedData(self.kernel_module.id)
             fitted_data.title = name
             fitted_data.name = name
@@ -1973 +2054 @@
             fitted_data.symbol = 'Line'
         # Notify the GUI manager so it can update the main model in DataExplorer
-        GuiUtils.updateModelItemWithPlot(self._index, fitted_data, name)
+        GuiUtils.updateModelItemWithPlot(self.all_data[self.data_index], fitted_data, name)
 
     def createTheoryIndex(self, fitted_data):
@@ -2003 +2084 @@
     def methodCompleteForData(self):
         '''return the method for result parsin on calc complete '''
-        return self.complete1D if isinstance(self.data, Data1D) else self.complete2D
-
-    def calculateQGridForModel(self):
-        """
-        Prepare the fitting data object, based on current ModelModel
-        """
-        if self.kernel_module is None:
-            return
+        return self.completed1D if isinstance(self.data, Data1D) else self.completed2D
+
+    def calculateQGridForModelExt(self, data=None, model=None, completefn=None, use_threads=True):
+        """
+        Wrapper for Calc1D/2D calls
+        """
+        if data is None:
+            data = self.data
+        if model is None:
+            model = self.kernel_module
+        if completefn is None:
+            completefn = self.methodCompleteForData()
+
         # Awful API to a backend method.
-        method = self.methodCalculateForData()(data=self.data,
-                                               model=self.kernel_module,
+        calc_thread = self.methodCalculateForData()(data=data,
+                                               model=model,
                                                page_id=0,
                                                qmin=self.q_range_min,
@@ -2022 +2108 @@
                                                fid=None,
                                                toggle_mode_on=False,
-                                               completefn=None,
+                                               completefn=completefn,
                                                update_chisqr=True,
                                                exception_handler=self.calcException,
                                                source=None)
-
-        calc_thread = threads.deferToThread(method.compute)
-        calc_thread.addCallback(self.methodCompleteForData())
-        calc_thread.addErrback(self.calculateDataFailed)
+        if use_threads:
+            if LocalConfig.USING_TWISTED:
+                # start the thread with twisted
+                thread = threads.deferToThread(calc_thread.compute)
+                thread.addCallback(completefn)
+                thread.addErrback(self.calculateDataFailed)
+            else:
+                # Use the old python threads + Queue
+                calc_thread.queue()
+                calc_thread.ready(2.5)
+        else:
+            results = calc_thread.compute()
+            completefn(results)
+
+    def calculateQGridForModel(self):
+        """
+        Prepare the fitting data object, based on current ModelModel
+        """
+        if self.kernel_module is None:
+            return
+        self.calculateQGridForModelExt()
 
     def calculateDataFailed(self, reason):
@@ -2036 +2139 @@
         """
         print("Calculate Data failed with ", reason)
+
+    def completed1D(self, return_data):
+        self.Calc1DFinishedSignal.emit(return_data)
+
+    def completed2D(self, return_data):
+        self.Calc2DFinishedSignal.emit(return_data)
 
     def complete1D(self, return_data):
@@ -2079 +2188 @@
         residuals_plot.id = "Residual " + residuals_plot.id
         self.createNewIndex(residuals_plot)
-        #self.communicate.plotUpdateSignal.emit([residuals_plot])
 
     def calcException(self, etype, value, tb):
@@ -2386 +2494 @@
     def setFittingStarted(self):
         """
-        Set item enablement on fitting start
-        """
-        #disable the Fit button
-        self.cmdFit.setText('Running...')
-        self.cmdFit.setEnabled(False)
+        Set buttion caption on fitting start
+        """
+        # Notify the user that fitting is being run
+        # Allow for stopping the job
+        self.cmdFit.setStyleSheet('QPushButton {color: red;}')
+        self.cmdFit.setText('Stop fit')
 
     def setFittingStopped(self):
         """
-        Set item enablement on fitting stop
-        """
-        #enable the Fit button
+        Set button caption on fitting stop
+        """
+        # Notify the user that fitting is available
+        self.cmdFit.setStyleSheet('QPushButton {color: black;}')
         self.cmdFit.setText("Fit")
-        self.cmdFit.setEnabled(True)
+        self.fit_started = False
 
     def readFitPage(self, fp):

src/sas/qtgui/Perspectives/Fitting/GPUOptions.py

@@ -170 +170 @@
         """
         help_location = GuiUtils.HELP_DIRECTORY_LOCATION
-        help_location += "/user/sasgui/perspectives/fitting/gpu_setup.html"
+        help_location += "/user/qtgui/Perspectives/Fitting/gpu_setup.html"
         help_location += "#device-selection"
         # Display the page in default browser

src/sas/qtgui/Perspectives/Fitting/ModelThread.py

@@ -8 +8 @@
 from sas.sascalc.data_util.calcthread import CalcThread
 from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
+import sas.qtgui.Utilities.LocalConfig as LocalConfig
 
 class Calc2D(CalcThread):
@@ -99 +100 @@
         output[index_model] = value
         elapsed = time.time() - self.starttime
-        #self.complete(image=output,
-        #               data=self.data,
-        #               page_id=self.page_id,
-        #               model=self.model,
-        #               state=self.state,
-        #               toggle_mode_on=self.toggle_mode_on,
-        #               elapsed=elapsed,
-        #               index=index_model,
-        #               fid=self.fid,
-        #               qmin=self.qmin,
-        #               qmax=self.qmax,
-        #               weight=self.weight,
-        #               #qstep=self.qstep,
-        #               update_chisqr=self.update_chisqr,
-        #               source=self.source)
-        return (output,
-                self.data,
-                self.page_id,
-                self.model,
-                self.state,
-                self.toggle_mode_on,
-                elapsed,
-                index_model,
-                self.fid,
-                self.qmin,
-                self.qmax,
-                self.weight,
-                self.update_chisqr,
-                self.source)
+
+        if LocalConfig.USING_TWISTED:
+            return (output,
+                    self.data,
+                    self.page_id,
+                    self.model,
+                    self.state,
+                    self.toggle_mode_on,
+                    elapsed,
+                    index_model,
+                    self.fid,
+                    self.qmin,
+                    self.qmax,
+                    self.weight,
+                    self.update_chisqr,
+                    self.source)
+        else:
+            self.complete(image=output,
+                           data=self.data,
+                           page_id=self.page_id,
+                           model=self.model,
+                           state=self.state,
+                           toggle_mode_on=self.toggle_mode_on,
+                           elapsed=elapsed,
+                           index=index_model,
+                           fid=self.fid,
+                           qmin=self.qmin,
+                           qmax=self.qmax,
+                           weight=self.weight,
+                           #qstep=self.qstep,
+                           update_chisqr=self.update_chisqr,
+                           source=self.source)
 
 
@@ -229 +233 @@
         elapsed = time.time() - self.starttime
 
-        return (self.data.x[index], output[index],
-                self.page_id,
-                self.state,
-                self.weight,
-                self.fid,
-                self.toggle_mode_on,
-                elapsed, index, self.model,
-                self.data,
-                self.update_chisqr,
-                self.source)
-
-        # TODO: as of 4.1, the output contains more items:
-        # unsmeared_* and pq_model/sq_model
-        # Need to add these too
-
-        #self.complete(x=self.data.x[index], y=output[index],
-        #              page_id=self.page_id,
-        #              state=self.state,
-        #              weight=self.weight,
-        #              fid=self.fid,
-        #              toggle_mode_on=self.toggle_mode_on,
-        #              elapsed=elapsed, index=index, model=self.model,
-        #              data=self.data,
-        #              update_chisqr=self.update_chisqr,
-        #              source=self.source,
-        #              unsmeared_model=unsmeared_output,
-        #              unsmeared_data=unsmeared_data,
-        #              unsmeared_error=unsmeared_error,
-        #              pq_model=pq_values,
-        #              sq_model=sq_values)
+        if LocalConfig.USING_TWISTED:
+            return (self.data.x[index], output[index],
+                    self.page_id,
+                    self.state,
+                    self.weight,
+                    self.fid,
+                    self.toggle_mode_on,
+                    elapsed, index, self.model,
+                    self.data,
+                    self.update_chisqr,
+                    self.source)
+        else:
+            self.complete(x=self.data.x[index], y=output[index],
+                          page_id=self.page_id,
+                          state=self.state,
+                          weight=self.weight,
+                          fid=self.fid,
+                          toggle_mode_on=self.toggle_mode_on,
+                          elapsed=elapsed, index=index, model=self.model,
+                          data=self.data,
+                          update_chisqr=self.update_chisqr,
+                          source=self.source,
+                          unsmeared_model=unsmeared_output,
+                          unsmeared_data=unsmeared_data,
+                          unsmeared_error=unsmeared_error,
+                          pq_model=pq_values,
+                          sq_model=sq_values)
 
     def results(self):

src/sas/qtgui/Perspectives/Fitting/ModelUtilities.py

@@ -173 +173 @@
         return {}
 
-    plugin_log("looking for models in: %s" % str(directory))
-    # compile_file(directory)  #always recompile the folder plugin
-    logging.info("plugin model dir: %s" % str(directory))
-
     plugins = {}
     for filename in os.listdir(directory):

src/sas/qtgui/Perspectives/Fitting/MultiConstraint.py

@@ -142 +142 @@
         try:
             help_location = GuiUtils.HELP_DIRECTORY_LOCATION + \
-            "/user/sasgui/perspectives/fitting/fitting_help.html#simultaneous-fits-with-constraints"
+            "/user/qtgui/Perspectives/Fitting/fitting_help.html#simultaneous-fits-with-constraints"
             webbrowser.open('file://' + os.path.realpath(help_location))
         except AttributeError:

src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui

@@ -216 +216 @@
             </property>
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch on magnetic scattering parameters.&lt;/p&gt;&lt;p&gt;This option is available only for 2D models.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch on Chain Fitting (parameter reuse) for batch datasets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">

src/sas/qtgui/Perspectives/Fitting/UnitTesting/ConstraintWidgetTest.py

@@ -30 +30 @@
             def communicator(self):
                 return GuiUtils.Communicate()
-            def communicate(self):
-                return GuiUtils.Communicate()
+            communicate = GuiUtils.Communicate()
 
         '''Create the perspective'''
         self.perspective = FittingWindow(dummy_manager())
+        ConstraintWidget.updateSignalsFromTab = MagicMock()
 
         self.widget = ConstraintWidget(parent=self.perspective)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

@@ -98 +98 @@
         data = Data1D(x=[1,2,3],y=[3,4,5])
         data.name = "boop"
+        data.id = "poop"
         return_data = (data.x,data.y, 7, None, None,
                         0, True, 0.0, 1, data,
@@ -107 +108 @@
         self.assertFalse(new_plot.is_data)
         self.assertEqual(new_plot.dy.size, 3)
-        self.assertEqual(new_plot.title, "boop [boop]")
-        self.assertEqual(new_plot.name, "boop [boop]")
+        self.assertEqual(new_plot.title, "boop [poop]")
+        self.assertEqual(new_plot.name, "boop [poop]")
 
     def testNew2DPlot(self):

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py

@@ -27 +27 @@
             def communicator(self):
                 return GuiUtils.Communicate()
-            def communicate(self):
-                return GuiUtils.Communicate()
+            communicate = GuiUtils.Communicate()
 
         '''Create the perspective'''
@@ -45 +44 @@
         self.assertEqual(len(self.widget.tabs), 1)
         self.assertEqual(self.widget.maxIndex, 1)
-        self.assertEqual(self.widget.maxCSIndex, 0)
         self.assertEqual(self.widget.getTabName(), "FitPage1")
 
@@ -66 +64 @@
         self.widget.addConstraintTab()
         self.assertEqual(len(self.widget.tabs), 2)
-        self.assertEqual(self.widget.getCSTabName(), "Const. & Simul. Fit1")
-        self.assertEqual(self.widget.maxCSIndex, 1)
+        self.assertEqual(self.widget.getCSTabName(), "Const. & Simul. Fit")
 
     def testResetTab(self):

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -181 +181 @@
 
         # Observe no such luck
-        self.assertEqual(self.widget.cbCategory.currentIndex(), 6)
+        self.assertEqual(self.widget.cbCategory.currentIndex(), 7)
         self.assertEqual(self.widget.cbModel.count(), 29)
 
@@ -737 +737 @@
 
             # the fit button changed caption and got disabled
-            self.assertEqual(self.widget.cmdFit.text(), 'Running...')
+            self.assertEqual(self.widget.cmdFit.text(), 'Stop fit')
             self.assertFalse(self.widget.cmdFit.isEnabled())
 
@@ -781 +781 @@
 
             # the fit button changed caption and got disabled
-            self.assertEqual(self.widget.cmdFit.text(), 'Running...')
+            self.assertEqual(self.widget.cmdFit.text(), 'Stop fit')
             self.assertFalse(self.widget.cmdFit.isEnabled())
 
@@ -1205 +1205 @@
         # Assure the row has the constraint
         self.assertEqual(self.widget.getConstraintForRow(row), const)
-        # but not complex constraint!
-        self.assertFalse(self.widget.rowHasConstraint(row))
+        self.assertTrue(self.widget.rowHasConstraint(row))
 
         # assign complex constraint now
@@ -1258 +1257 @@
         self.assertEqual(spy.called()[1]['args'][0], [row2])
 
-        # Other properties
-        self.assertEqual(self.widget.getConstraintsForModel(), [('background', '0.001'), ('radius', '20')])
-
     def testDeleteConstraintOnParameter(self):
         """
@@ -1294 +1290 @@
 
         # see that the other constraint is still present
-        self.assertEqual(self.widget.getConstraintsForModel(), [('radius', '20')])
+        cons = self.widget.getConstraintForRow(4) # 4 = radius
+        self.assertEqual(cons.param, "radius")
+        self.assertEqual(cons.value, "20")
 
         # kill the other constraint
@@ -1300 +1298 @@
 
         # see that the other constraint is still present
-        self.assertEqual(self.widget.getConstraintsForModel(), [])
+        self.assertEqual(self.widget.getConstraintsForModel(), [('radius', None)])
 
     def testGetConstraintForRow(self):
@@ -1400 +1398 @@
 
         # simple constraints
-        self.assertEqual(self.widget.getConstraintsForModel(), [('background', '0.001'), ('radius', '20')])
+        # self.assertEqual(self.widget.getConstraintsForModel(), [('background', '0.001'), ('radius', '20')])
+        cons = self.widget.getConstraintForRow(1) # 1 - background
+        self.assertEqual(cons.param, "background")
+        self.assertEqual(cons.value, "0.001")
+        cons = self.widget.getConstraintForRow(4) # 4 = radius
+        self.assertEqual(cons.param, "radius")
+        self.assertEqual(cons.value, "20")
+
         objects = self.widget.getConstraintObjectsForModel()
         self.assertEqual(len(objects), 2)
@@ -1406 +1411 @@
         self.assertEqual(objects[0].param, 'background')
 
-
         # add complex constraint
         const = Constraint(parent=None, param='scale', func='5*sld')
         row = 0
         self.widget.addConstraintToRow(constraint=const, row=row)
-        self.assertEqual(self.widget.getConstraintsForModel(),[('scale', '5*sld'), ('background', '0.001'), ('radius', '20')])
+        #self.assertEqual(self.widget.getConstraintsForModel(),[('scale', '5*sld'), ('background', '0.001'), ('radius', None)])
+        cons = self.widget.getConstraintForRow(4) # 4 = radius
+        self.assertEqual(cons.param, "radius")
+        self.assertEqual(cons.value, "20")
+
         objects = self.widget.getConstraintObjectsForModel()
         self.assertEqual(len(objects), 3)