Changeset a98014ab in sasview for src

Timestamp:

Oct 3, 2018 5:00:21 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

34e5170

Parents:

672c0e97

Message:

Enabled weird instantiation of initial values for certain parameters in
magnetism. Fixed handling of the magnetism state in GUI. SASVIEW-1199

File:

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

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

@@ -999 +999 @@
         return menu
 
+    def canHaveMagnetism(self):
+        """
+        Checks if the current model has magnetic scattering implemented
+        """
+        current_model = self.cbModel.currentText()
+        return self.is2D and current_model in self.MAGNETIC_MODELS
+
     def onSelectModel(self):
         """
@@ -1011 +1018 @@
         if not model:
             return
-        self.chkMagnetism.setEnabled(self.is2D and model in self.MAGNETIC_MODELS)
+        self.chkMagnetism.setEnabled(self.canHaveMagnetism())
+        self.tabFitting.setTabEnabled(TAB_MAGNETISM, self.chkMagnetism.isChecked() and self.canHaveMagnetism())
+
         # Reset parameters to fit
         self.resetParametersToFit()
@@ -1584 +1593 @@
         if self.chkPolydispersity.isChecked():
             params_to_fit += self.poly_params_to_fit
-        if self.chkMagnetism.isChecked():
+        if self.chkMagnetism.isChecked() and self.canHaveMagnetism():
             params_to_fit += self.magnet_params_to_fit
         if not params_to_fit:
@@ -2259 +2268 @@
         if self.chkPolydispersity.isChecked() and self.poly_params_to_fit:
             return True
-        if self.chkMagnetism.isChecked() and self.magnet_params_to_fit:
+        if self.chkMagnetism.isChecked() and self.canHaveMagnetism() and self.magnet_params_to_fit:
             return True
         return False
@@ -2493 +2502 @@
                 model.setParam(key, value)
         # add magnetic params if asked
-        if self.chkMagnetism.isChecked() and self._magnet_model.rowCount() > 0:
+        if self.chkMagnetism.isChecked() and self.canHaveMagnetism() and self._magnet_model.rowCount() > 0:
             for key, value in self.magnet_params.items():
                 model.setParam(key, value)
@@ -2966 +2975 @@
             return
         self._magnet_model.clear()
-        [self.addCheckedMagneticListToModel(param, self._magnet_model) for param in \
-            self.model_parameters.call_parameters if param.type == 'magnetic']
+        # default initial value
+        m0 = 0.5e-06
+        for param in self.model_parameters.call_parameters:
+            if param.type != 'magnetic': continue
+            if "M0" in param.name:
+                m0 += 0.5e-06
+                value = m0
+            else:
+                value = param.default
+            self.addCheckedMagneticListToModel(param, value)
+
         FittingUtilities.addHeadersToModel(self._magnet_model)
 
@@ -2984 +3002 @@
         return shell_names
 
-    def addCheckedMagneticListToModel(self, param, model):
+    def addCheckedMagneticListToModel(self, param, value):
         """
         Wrapper for model update with a subset of magnetic parameters
@@ -2999 +3017 @@
 
         checked_list = [param.name,
-                        str(param.default),
+                        str(value),
                         str(param.limits[0]),
                         str(param.limits[1]),
                         param.units]
 
-        self.magnet_params[param.name] = param.default
-
-        FittingUtilities.addCheckedListToModel(model, checked_list)
+        self.magnet_params[param.name] = value
+
+        FittingUtilities.addCheckedListToModel(self._magnet_model, checked_list)
 
     def enableStructureFactorControl(self, structure_factor):
@@ -3517 +3535 @@
         if self.chkPolydispersity.isChecked():
             self.iterateOverPolyModel(gatherPolyParams)
-        if self.chkMagnetism.isChecked() and self.chkMagnetism.isEnabled():
+        if self.chkMagnetism.isChecked() and self.canHaveMagnetism():
             self.iterateOverMagnetModel(gatherMagnetParams)