Changeset a4b9b7a in sasview for src/sas/qtgui/Utilities/GridPanel.py

Timestamp:

Oct 5, 2018 5:16:46 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:

00a40bd

Parents:

3ab2105

Message:

Modified batch grid viewer after changes to magnetic param names.
Adjusted unit tests.

File:

• src/sas/qtgui/Utilities/GridPanel.py (modified) (1 diff)

src/sas/qtgui/Utilities/GridPanel.py

@@ -307 +307 @@
         model = data[0][0]
 
-        # TODO: add a conditional for magnetic models
-        param_list = [m for m in model.model.params.keys() if ":" not in m]
+        disperse_params = list(model.model.dispersion.keys())
+        magnetic_params = model.model.magnetic_params
+        optimized_params = model.param_list
+        # Create the main parameter list
+        param_list = [m for m in model.model.params.keys() if (m not in model.model.magnetic_params and ".width" not in m)]
+
+        # add fitted polydisp parameters
+        param_list += [m+".width" for m in disperse_params if m+".width" in optimized_params]
+
+        # add fitted magnetic params
+        param_list += [m for m in magnetic_params if m in optimized_params]
 
         # Check if 2D model. If not, remove theta/phi