Changeset 3c24ccd in sasmodels for sasmodels/compare.py

Timestamp:

Oct 18, 2017 10:03:43 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

ef8e68c

Parents:

fbb9397

Message:

add -weights option to sascomp to show dispersity distribution

File:

• sasmodels/compare.py (modified) (6 diffs)

sasmodels/compare.py

@@ -42 +42 @@
 from . import exception
 from .data import plot_theory, empty_data1D, empty_data2D, load_data
-from .direct_model import DirectModel
+from .direct_model import DirectModel, get_mesh
 from .convert import revert_name, revert_pars, constrain_new_to_old
 from .generate import FLOAT_RE
+from .weights import plot_weights
 
 try:
@@ -102 +103 @@
     -abs/-rel* plot relative or absolute error
     -title="note" adds note to the plot title, after the model name
+    -weights shows weights plots for the polydisperse parameters
 
     === output options ===
@@ -834 +836 @@
         if opts['plot']:
             limits = plot_models(opts, result, limits=limits, setnum=k)
+        if opts['show_weights']:
+            base, _ = opts['engines']
+            base_pars, _ = opts['pars']
+            model_info = base._kernel.info
+            dim = base._kernel.dim
+            plot_weights(model_info, get_mesh(model_info, base_pars, dim=dim))
     if opts['plot']:
         import matplotlib.pyplot as plt
@@ -996 +1004 @@
 OPTIONS = [
     # Plotting
-    'plot', 'noplot',
+    'plot', 'noplot', 'weights',
     'linear', 'log', 'q4',
     'rel', 'abs',
@@ -1146 +1154 @@
         'engine'    : 'default',
         'evals'     : '1',
+        'show_weights' : False,
     }
     for arg in flags:
@@ -1194 +1203 @@
         elif arg == '-demo':    opts['use_demo'] = True
         elif arg == '-default': opts['use_demo'] = False
+        elif arg == '-weights': opts['show_weights'] = True
         elif arg == '-html':    opts['html'] = True
         elif arg == '-help':    opts['html'] = True