Changeset 248561a in sasmodels for sasmodels/compare.py

Timestamp:

Oct 17, 2016 11:09:44 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

52e9a45

Parents:

7fcdc9f

Message:

allow math functions such as sqrt and atan in parameter expressions

File:

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

sasmodels/compare.py

@@ -110 +110 @@
 
 kerneldll.ALLOW_SINGLE_PRECISION_DLLS = True
+
+# list of math functions for use in evaluating parameters
+MATH = dict((k,getattr(math, k)) for k in dir(math) if not k.startswith('_'))
 
 # CRUFT python 2.6
@@ -923 +926 @@
     pars = get_pars(model_info, opts['use_demo'])
     pars2 = get_pars(model_info2, opts['use_demo'])
+    pars2.update((k, v) for k, v in pars.items() if k in pars2)
     # randomize parameters
     #pars.update(set_pars)  # set value before random to control range
@@ -953 +957 @@
 
     # Evaluate preset parameter expressions
-    context = pars.copy()
+    context = MATH.copy()
+    context.update(pars)
     context.update((k,v) for k,v in presets.items() if isinstance(v, float))
     for k, v in presets.items():
         if not isinstance(v, float) and not k.endswith('_type'):
             presets[k] = eval(v, context)
-    context = pars.copy()
     context.update(presets)
     context.update((k,v) for k,v in presets2.items() if isinstance(v, float))
@@ -995 +999 @@
 
     if opts['show_pars']:
-        print(str(parlist(model_info, pars, opts['is2d'])))
+        if not same_model:
+            print("==== %s ====="%model_info.name)
+            print(str(parlist(model_info, pars, opts['is2d'])))
+            print("==== %s ====="%model_info2.name)
+            print(str(parlist(model_info2, pars2, opts['is2d'])))
+        else:
+            print(str(parlist(model_info, pars, opts['is2d'])))
 
     # Create the computational engines