Changeset 9a7c81c in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

May 28, 2018 6:08:36 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, 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:

3010f68

Parents:

c389557

Message:

Fixed smearing for 1 and 2D

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (11 diffs)

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

@@ -400 +400 @@
         self.onSelectModel()
         # Smearing tab
-        self.smearing_widget.updateSmearing(self.data)
+        self.smearing_widget.updateData(self.data)
 
     def acceptsData(self):
@@ -472 +472 @@
         self.lblChi2Value.setText("---")
         # Smearing tab
-        self.smearing_widget.updateSmearing(self.data)
+        self.smearing_widget.updateData(self.data)
         # Line edits in the option tab
         self.updateQRange()
@@ -515 +515 @@
         self.communicate.customModelDirectoryChanged.connect(self.onCustomModelChange)
         self.communicate.saveAnalysisSignal.connect(self.savePageState)
+        self.smearing_widget.smearingChangedSignal.connect(self.onSmearingOptionsUpdate)
         #self.communicate.saveReportSignal.connect(self.saveReport)
 
@@ -1441 +1442 @@
             raise ValueError('Fitting requires at least one parameter to optimize.')
 
-        # Potential weights added directly to data
-        self.addWeightingToData(data)
-
         # Potential smearing added
         # Remember that smearing_min/max can be None ->
         # deal with it until Python gets discriminated unions
-        smearing, accuracy, smearing_min, smearing_max = self.smearing_widget.state()
+        self.addWeightingToData(data)
 
         # Get the constraints.
@@ -1455 +1453 @@
             constraints = self.getConstraintsForFitting()
 
-        smearer = None
+        smearer = self.smearing_widget.smearer()
         handler = None
         batch_inputs = {}
@@ -1464 +1462 @@
             fitter_single = Fit() if fitter is None else fitter
             data = GuiUtils.dataFromItem(fit_index)
+            # Potential weights added directly to data
+            self.addWeightingToData(data)
             try:
                 fitter_single.set_model(model, fit_id, params_to_fit, data=data,
@@ -1703 +1703 @@
         self.showPlot()
 
+    def onSmearingOptionsUpdate(self):
+        """
+        React to changes in the smearing widget
+        """
+        self.calculateQGridForModel()
+
     def recalculatePlotData(self):
         """
@@ -1834 +1840 @@
         # Send original data for weighting
         weight = FittingUtilities.getWeight(data=data, is2d=self.is2D, flag=self.weighting)
-        update_module = data.err_data if self.is2D else data.dy
-        # Overwrite relevant values in data
-        update_module = weight
+        if self.is2D:
+            data.err_data = weight
+        else:
+            data.dy = weight
+        pass
 
     def updateQRange(self):
@@ -1889 +1897 @@
         # Change the model name to a monicker
         self.kernel_module.name = self.modelName()
+        # Update the smearing tab
+        self.smearing_widget.updateKernelModel(kernel_model=self.kernel_module)
 
         # (Re)-create headers
@@ -2106 +2116 @@
         if completefn is None:
             completefn = self.methodCompleteForData()
-
+        smearer = self.smearing_widget.smearer()
         # Awful API to a backend method.
         calc_thread = self.methodCalculateForData()(data=data,
@@ -2113 +2123 @@
                                                qmin=self.q_range_min,
                                                qmax=self.q_range_max,
-                                               smearer=None,
+                                               smearer=smearer,
                                                state=None,
                                                weight=None,