Changeset 6dbff18 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Sep 3, 2018 10:14:52 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_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

79bd268

Parents:

8274471e

git-author:

Piotr Rozyczko <rozyczko@…> (09/03/18 10:13:50)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/03/18 10:14:52)

Message:

Restructure parameters to fit into three separate lists to enable proper processing. SASVIEW-1008

File:

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

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

@@ -226 +226 @@
         self.models = {}
         # Parameters to fit
-        self.parameters_to_fit = None
+        self.main_params_to_fit = []
+        self.poly_params_to_fit = []
+        self.magnet_params_to_fit = []
+
         # Fit options
         self.q_range_min = 0.005
@@ -956 +959 @@
 
         # Reset parameters to fit
-        self.parameters_to_fit = None
+        self.resetParametersToFit()
         self.has_error_column = False
         self.has_poly_error_column = False
@@ -980 +983 @@
 
         # Reset parameters to fit
-        self.parameters_to_fit = None
+        self.resetParametersToFit()
         self.has_error_column = False
         self.has_poly_error_column = False
 
         self.respondToModelStructure(model=model, structure_factor=structure)
+
+    def resetParametersToFit(self):
+        """
+        Clears the list of parameters to be fitted
+        """
+        self.main_params_to_fit = []
+        self.poly_params_to_fit = []
+        self.magnet_params_to_fit = []
 
     def onCustomModelChange(self):
@@ -1132 +1143 @@
             parameter_name = parameter_name + '.width'
             if value == QtCore.Qt.Checked:
-                self.parameters_to_fit.append(parameter_name)
+                self.poly_params_to_fit.append(parameter_name)
             else:
-                if parameter_name in self.parameters_to_fit:
-                    self.parameters_to_fit.remove(parameter_name)
-            self.cmdFit.setEnabled(self.parameters_to_fit != [] and self.logic.data_is_loaded)
+                if parameter_name in self.poly_params_to_fit:
+                    self.poly_params_to_fit.remove(parameter_name)
+            self.cmdFit.setEnabled(self.haveParamsToFit())
 
         elif model_column in [delegate.poly_min, delegate.poly_max]:
@@ -1188 +1199 @@
             value = item.checkState()
             if value == QtCore.Qt.Checked:
-                self.parameters_to_fit.append(parameter_name)
+                self.magnet_params_to_fit.append(parameter_name)
             else:
-                if parameter_name in self.parameters_to_fit:
-                    self.parameters_to_fit.remove(parameter_name)
-            self.cmdFit.setEnabled(self.parameters_to_fit != [] and self.logic.data_is_loaded)
+                if parameter_name in self.magnet_params_to_fit:
+                    self.magnet_params_to_fit.remove(parameter_name)
+            self.cmdFit.setEnabled(self.haveParamsToFit())
             # Update state stack
             self.updateUndo()
@@ -1477 +1488 @@
         qmin = self.q_range_min
         qmax = self.q_range_max
-        params_to_fit = self.parameters_to_fit
+
+        params_to_fit = self.main_params_to_fit
+        if self.chkPolydispersity.isChecked():
+            params_to_fit += self.poly_params_to_fit
+        if self.chkMagnetism.isChecked():
+            params_to_fit += self.magnet_params_to_fit
         if not params_to_fit:
             raise ValueError('Fitting requires at least one parameter to optimize.')
@@ -2046 +2062 @@
         self._last_model_row = self._model_model.rowCount()
 
+    def haveParamsToFit(self):
+        """
+        Finds out if there are any parameters ready to be fitted
+        """
+        return (self.main_params_to_fit!=[]
+                or self.poly_params_to_fit!=[]
+                or self.magnet_params_to_fit != []) and \
+                self.logic.data_is_loaded
+
     def onMainParamsChange(self, item):
         """
@@ -2054 +2079 @@
         if model_column == 0:
             self.checkboxSelected(item)
-            self.cmdFit.setEnabled(self.parameters_to_fit != [] and self.logic.data_is_loaded)
+            self.cmdFit.setEnabled(self.haveParamsToFit())
             # Update state stack
             self.updateUndo()
@@ -2113 +2138 @@
         # Convert to proper indices and set requested enablement
         self.setParameterSelection(status)
-        #[self._model_model.item(row, 0).setCheckState(status) for row in self.selectedParameters()]
         self._model_model.blockSignals(False)
 
         # update the list of parameters to fit
-        main_params = self.checkedListFromModel(self._model_model)
-        poly_params = self.checkedListFromModel(self._poly_model)
-        magnet_params = self.checkedListFromModel(self._magnet_model)
-
-        # Retrieve poly params names
-        poly_params = [param.rsplit()[-1] + '.width' for param in poly_params]
-
-        self.parameters_to_fit = main_params + poly_params + magnet_params
+        self.main_params_to_fit = self.checkedListFromModel(self._model_model)
 
     def checkedListFromModel(self, model):
@@ -2752 +2769 @@
 
         fp.chi2 = self.chi2
-        fp.parameters_to_fit = self.parameters_to_fit
+        fp.main_params_to_fit = self.main_params_to_fit
+        fp.poly_params_to_fit = self.poly_params_to_fit
+        fp.magnet_params_to_fit = self.magnet_params_to_fit
         fp.kernel_module = self.kernel_module