Changeset f5e2a10a in sasview for src/sas

Timestamp:

Mar 26, 2019 6:53:47 AM (6 years ago)

Author:

ibressler

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl

Children:

bad4a52

Parents:

14e1ff0

Message:

show a polydispersity plot for 2D data as well

• same approach as for 1D
• identical code for both cases moved into internal helper method
• renamed polydispersity Y axis to 'probability' as suggested
• attempt to close/finish SASVIEW-1035 and trac ticket 17
• ​https://jira.esss.lu.se/browse/SASVIEW-1035
• http://trac.sasview.org/ticket/17

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (1 diff)
• FittingWidget.py (modified) (3 diffs)

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

@@ -590 +590 @@
         xunit = model.details[name][0]
         data1d.xaxis(r'\rm{{{}}}'.format(name.replace('_', '\_')), xunit)
-        data1d.yaxis(r'\rm{weight}', 'normalized')
+        data1d.yaxis(r'\rm{probability}', 'normalized')
         data1d.scale = 'linear'
         data1d.symbol = 'Line'

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

@@ -2737 +2737 @@
         self.Calc2DFinishedSignal.emit(return_data)
 
+    def _appendPlotsPolyDisp(self, new_plots, return_data, fitted_data):
+        """
+        Internal helper for 1D and 2D for creating plots of the polydispersity distribution for
+        parameters which have a polydispersity enabled.
+        """
+        for plot in FittingUtilities.plotPolydispersities(return_data.get('model', None)):
+            data_id = fitted_data.id.split()
+            plot.id = "{} [{}] {}".format(data_id[0], plot.name, " ".join(data_id[1:]))
+            data_name = fitted_data.name.split()
+            plot.name = " ".join([data_name[0], plot.name] + data_name[1:])
+            self.createNewIndex(plot)
+            new_plots.append(plot)
+
     def complete1D(self, return_data):
         """
@@ -2769 +2782 @@
             self.communicate.deleteIntermediateTheoryPlotsSignal.emit(self.kernel_module.id)
 
-        # Create plots for parameters with enabled polydispersity
-        for plot in FittingUtilities.plotPolydispersities(return_data.get('model', None)):
-            data_id = fitted_data.id.split()
-            plot.id = "{} [{}] {}".format(data_id[0], plot.name, " ".join(data_id[1:]))
-            data_name = fitted_data.name.split()
-            plot.name = " ".join([data_name[0], plot.name] + data_name[1:])
-            self.createNewIndex(plot)
-            new_plots.append(plot)
+        self._appendPlotsPolyDisp(new_plots, return_data, fitted_data)
 
         # Create plots for intermediate product data
@@ -2813 +2819 @@
         if residuals is not None:
             new_plots.append(residuals)
+
+        self._appendPlotsPolyDisp(new_plots, return_data, fitted_data)
 
         # Update/generate plots