Changeset 3ae70f9 in sasview

Timestamp:

Sep 17, 2018 8:17:08 AM (6 years ago)

Author:

ibressler

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:

5990185

Parents:

9f4eaeb

Message:

plot the polydispersity SASVIEW-1035

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (1 diff)
• Perspectives/Fitting/FittingUtilities.py (modified) (1 diff)
• Perspectives/Fitting/FittingWidget.py (modified) (1 diff)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -579 +579 @@
             # Don't plot intermediate results, e.g. P(Q), S(Q)
             match = GuiUtils.theory_plot_ID_pattern.match(plot.id)
-            # 2nd match group contains the identifier for the intermediate result, if present (e.g. "[P(Q)]")
+            # 2nd match group contains the identifier for the intermediate
+            # result, if present (e.g. "[P(Q)]")
             if match and match.groups()[1] != None:
                 continue
-            # Don't include plots from different fitpages, but always include the original data
-            if fitpage_name in plot.name or filename in plot.name or filename == plot.filename:
+            # Don't include plots from different fitpages,
+            # but always include the original data
+            if (fitpage_name in plot.name
+                    or filename in plot.name
+                    or filename == plot.filename):
                 # Residuals get their own plot
                 if plot.plot_role == Data1D.ROLE_RESIDUAL:

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

@@ -571 +571 @@
     return residuals
 
+def plotPolydispersities(model, disp_models):
+    plots = []
+    if model is None:
+        return plots
+    # test for model being a sasmodels.sasview_model.SasviewModel?
+    for name, pars in model.dispersion.items():
+        if 0 == pars['width']:
+            continue # no actual polydispersity
+        disp_args = pars.copy()
+        disp_type = disp_args.pop('type', None)
+        if disp_type is None:
+            continue # show an error? "poly type ... not found"
+        disp_func = disp_models[disp_type](**disp_args)
+        center = model.params[name]
+        # same as in sasmodels.weights.Dispersion
+        lb = center - disp_args['nsigmas']*disp_args['width']*center
+        ub = center + disp_args['nsigmas']*disp_args['width']*center
+        arr = disp_func.get_weights(center, lb, ub, relative = True)
+        # create Data1D as in residualsData1D() and fill x/y members
+        # similar to FittingLogic._create1DPlot() but different data/axes
+        data1d = Data1D(x = arr[0], y = arr[1])
+        data1d.xaxis('\\rm{{{}}} '.format(name.replace('_', '\_')), 'A') # correct unit?
+        data1d.yaxis('\\rm{{{weight}}}', 'normalized')
+        data1d.scale = 'linear'
+        data1d.symbol = 'Line'
+        data1d.name = "{} polydispersity".format(name)
+        data1d.id = data1d.name # placeholder, has to be completed later
+        data1d.plot_role = Data1D.ROLE_DELETABLE
+        plots.append(data1d)
+    return plots
+
 def binary_encode(i, digits):
     return [i >> d & 1 for d in range(digits)]

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

@@ -2435 +2435 @@
             new_plots.append(residuals)
 
+        model = return_data.get('model', None)
+        for plot in FittingUtilities.plotPolydispersities(
+                                        model, POLYDISPERSITY_MODELS):
+            data_id = fitted_data.id.split()
+            plot.id = " ".join([data_id[0], plot.name] + 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)
+
         if self.data_is_loaded:
-            # delete any plots associated with the data that were not updated (e.g. to remove beta(Q), S_eff(Q))
+            # delete any plots associated with the data that were not updated
+            # (e.g. to remove beta(Q), S_eff(Q))
             GuiUtils.deleteRedundantPlots(self.all_data[self.data_index], new_plots)
             pass
         else:
-            # delete theory items for the model, in order to get rid of any redundant items, e.g. beta(Q), S_eff(Q)
+            # delete theory items for the model, in order to get rid of any
+            # redundant items, e.g. beta(Q), S_eff(Q)
             self.communicate.deleteIntermediateTheoryPlotsSignal.emit(self.kernel_module.id)