Changeset b6f10d8 in sasmodels

Timestamp:

Oct 17, 2016 8:35:02 PM (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:

158cee4

Parents:

0b040de

Message:

sascomp: default to pd_n=35 if pd given on command line

File:

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

sasmodels/compare.py

@@ -886 +886 @@
         'mono'      : False,
         # Default to magnetic a magnetic moment is set on the command line
-        'magnetic'  : any(v.startswith('M0:') for v in values),
+        'magnetic'  : False,
         'show_pars' : False,
         'show_hist' : False,
@@ -971 +971 @@
         pars = suppress_pd(pars)
         pars2 = suppress_pd(pars2)
+    if not opts['magnetic']:
+        pars = suppress_magnetism(pars)
+        pars2 = suppress_magnetism(pars2)
 
     # Fill in parameters given on the command line
@@ -988 +991 @@
             presets2[k] = float(v2) if isnumber(v2) else v2
 
+    # If pd given on the command line, default pd_n to 35
+    for k, v in list(presets.items()):
+        if k.endswith('_pd'):
+            presets.setdefault(k+'_n', 35.)
+    for k, v in list(presets2.items()):
+        if k.endswith('_pd'):
+            presets2.setdefault(k+'_n', 35.)
+
     # Evaluate preset parameter expressions
     context = MATH.copy()
@@ -1007 +1018 @@
     constrain_pars(model_info, pars)
     constrain_pars(model_info2, pars2)
-    if not opts['magnetic']:
-        pars = suppress_magnetism(pars)
-        pars2 = suppress_magnetism(pars2)
 
     same_model = name == name2 and pars == pars