Changeset a4b9b7a in sasview

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.

Location:

src/sas/qtgui

Files:

• Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (2 diffs)
• Utilities/GridPanel.py (modified) (1 diff)

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

@@ -120 +120 @@
         fittingWindow.SASModelToQModel("cylinder")
         mag_index = fittingWindow.lstMagnetic.model().index(0,0)
-        self.assertEqual(mag_index.data(), "up:frac_i")
+        self.assertEqual(mag_index.data(), "up_frac_i")
         mag_index = fittingWindow.lstMagnetic.model().index(1,0)
-        self.assertEqual(mag_index.data(), "up:frac_f")
+        self.assertEqual(mag_index.data(), "up_frac_f")
         mag_index = fittingWindow.lstMagnetic.model().index(2,0)
-        self.assertEqual(mag_index.data(), "up:angle")
+        self.assertEqual(mag_index.data(), "up_angle")
         mag_index = fittingWindow.lstMagnetic.model().index(3,0)
-        self.assertEqual(mag_index.data(), "M0:sld")
+        self.assertEqual(mag_index.data(), "sld_M0")
         mag_index = fittingWindow.lstMagnetic.model().index(4,0)
-        self.assertEqual(mag_index.data(), "mtheta:sld")
+        self.assertEqual(mag_index.data(), "sld_mtheta")
         mag_index = fittingWindow.lstMagnetic.model().index(5,0)
-        self.assertEqual(mag_index.data(), "mphi:sld")
+        self.assertEqual(mag_index.data(), "sld_mphi")
         mag_index = fittingWindow.lstMagnetic.model().index(6,0)
-        self.assertEqual(mag_index.data(), "M0:sld_solvent")
+        self.assertEqual(mag_index.data(), "sld_solvent_M0")
         mag_index = fittingWindow.lstMagnetic.model().index(7,0)
-        self.assertEqual(mag_index.data(), "mtheta:sld_solvent")
+        self.assertEqual(mag_index.data(), "sld_solvent_mtheta")
         mag_index = fittingWindow.lstMagnetic.model().index(8,0)
-        self.assertEqual(mag_index.data(), "mphi:sld_solvent")
+        self.assertEqual(mag_index.data(), "sld_solvent_mphi")
 
         # test the delegate a bit
@@ -581 +581 @@
         for row in range(self.widget._magnet_model.rowCount()):
             func_index = self.widget._magnet_model.index(row, 0)
-            self.assertIn(':', self.widget._magnet_model.item(row, 0).text())
+            self.assertIn('_', self.widget._magnet_model.item(row, 0).text())
 
 

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