Changeset e9b1663d in sasmodels for sasmodels/compare.py

Timestamp:

Mar 23, 2016 3:02:10 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

76a9ffe

Parents:

69aa451 (diff), 34edbb8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

pull from master

File:

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

sasmodels/compare.py

@@ -69 +69 @@
     -accuracy=Low accuracy of the resolution calculation Low, Mid, High, Xhigh
     -edit starts the parameter explorer
+    -default/-demo* use demo vs default parameters
 
 Any two calculation engines can be selected for comparison:
@@ -364 +365 @@
         composition_type, parts = model_info['composition']
         if composition_type == 'product':
-            from sas.models.MultiplicationModel import MultiplicationModel
+            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
             P, S = [get_model(p) for p in model_info['oldname']]
             model = MultiplicationModel(P, S)
@@ -631 +632 @@
     'hist', 'nohist',
     'edit',
+    'demo', 'default',
     ])
 VALUE_OPTIONS = [
@@ -654 +656 @@
 
 
-def get_demo_pars(model_info):
+def get_pars(model_info, use_demo=False):
     """
     Extract demo parameters from the model definition.
@@ -670 +672 @@
 
     # Plug in values given in demo
-    pars.update(model_info['demo'])
+    if use_demo:
+        pars.update(model_info['demo'])
     return pars
 
@@ -727 +730 @@
         'rel_err'   : True,
         'explore'   : False,
+        'use_demo'  : True,
     }
     engines = []
@@ -765 +769 @@
         elif arg == '-sasview': engines.append(arg[1:])
         elif arg == '-edit':    opts['explore'] = True
+        elif arg == '-demo':    opts['use_demo'] = True
+        elif arg == '-default':    opts['use_demo'] = False
     # pylint: enable=bad-whitespace
 
@@ -782 +788 @@
     # Get demo parameters from model definition, or use default parameters
     # if model does not define demo parameters
-    pars = get_demo_pars(model_info)
+    pars = get_pars(model_info, opts['use_demo'])
+
 
     # Fill in parameters given on the command line