Changeset 1c699de in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Aug 25, 2017 8:02:34 AM (7 years ago)

Author:

lewis

Branches:

master, ESS_GUI, ESS_GUI_Docs, 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

9f703d0

Parents:

968d67e

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/25/17 07:59:32)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/25/17 08:02:34)

Message:

Copy polydispersity params to Excel/LaTeX correctly

Closes #906

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (5 diffs)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2950 +2950 @@
         if self.parameters:
 
+            disp_params = []
+            for param in self.disp_list:
+                p1, p2 = param.split('.')
+                if p1 not in disp_params:
+                    disp_params.append(p1)
+
             for param in self.parameters:
                 content += param[1]  # parameter name
                 content += tab
+                if param[1] in disp_params:
+                    content += param[1] + ".width"
+                    content += tab
                 content += param[1] + "_err"
                 content += tab
@@ -2962 +2971 @@
                 content += param[2].GetValue()  # value
                 content += tab
+                if param[1] in disp_params:
+                    content += str(self.model.getParam(param[1] + '.width'))
+                    content += tab
                 content += param[4].GetValue()  # error
                 content += tab
@@ -2990 +3002 @@
         # Do it if params exist
         if self.parameters:
+            disp_params = []
+            for param in self.disp_list:
+                p1, p2 = param.split('.')
+                if p1 not in disp_params:
+                    disp_params.append(p1)
 
             content += '{|'
-            for param in self.parameters:
+            for param in (self.parameters + disp_params):
                 content += 'l|l|'
             content += '}\hline'
@@ -3000 +3017 @@
                 content += param[1].replace('_', '\_')  # parameter name
                 content += ' & '
+                if param[1] in disp_params:
+                    content += param[1].replace('_', '\_') + ".width"
+                    content += ' & '
                 content += param[1].replace('_', '\_') + "\_err"
                 if index < len(self.parameters) - 1:
@@ -3010 +3030 @@
                 content += param[2].GetValue()  # parameter value
                 content += ' & '
+                if param[1] in disp_params:
+                    content += str(self.model.getParam(param[1] + '.width'))
+                    content += ' & '
                 content += param[4].GetValue()  # parameter error
                 if index < len(self.parameters) - 1: