Changeset 9a66e65 in sasmodels for sasmodels/compare.py

Timestamp:

Dec 9, 2015 9:12:17 AM (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:

716abe0

Parents:

dcef2ee

Message:

refactor sasmodels to sasview parameter conversion

File:

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

sasmodels/compare.py

@@ -20 +20 @@
 from .data import plot_theory, empty_data1D, empty_data2D
 from .direct_model import DirectModel
-from .convert import revert_model
+from .convert import revert_model, constrain_new_to_old
 kerneldll.ALLOW_SINGLE_PRECISION_DLLS = True
 
@@ -81 +81 @@
 
     for k,v in pars.items():
-        if k.startswith("num_pearls_") or k.startswith("thick_string_"):
-            continue
-        if k.endswith("_pd"):
-            model.dispersion[k[:-3]]['width'] = v
-        elif k.endswith("_pd_n"):
-            model.dispersion[k[:-5]]['npts'] = v
-        elif k.endswith("_pd_nsigma"):
-            model.dispersion[k[:-10]]['nsigmas'] = v
-        elif k.endswith("_pd_type"):
-            model.dispersion[k[:-8]]['type'] = v
+        parts = k.split('.')  # polydispersity components
+        if len(parts) == 2:
+            model.dispersion[parts[0]][parts[1]] = v
         else:
             model.setParam(k, v)
@@ -129 +122 @@
 
 def constrain_pars(model_definition, pars):
+    """
+    Restrict parameters to valid values.
+    """
     name = model_definition.name
     if name == 'capped_cylinder' and pars['cap_radius'] < pars['radius']:
@@ -141 +137 @@
         rg_max = np.sqrt(90*np.log(10) + 3*np.log(pars['scale']))/q_max
         pars['rg'] = min(pars['rg'],rg_max)
-
-    # These constraints are only needed for comparison to sasview
-    if name in ('teubner_strey','broad_peak'):
-        del pars['scale']
-    if name in ('guinier',):
-        del pars['background']
-    if getattr(model_definition, 'category', None) == 'structure-factor':
-        del pars['scale'], pars['background']
-
 
 def parlist(pars):
@@ -277 +264 @@
     pars.update(set_pars)  # set value after random to control value
     constrain_pars(model_definition, pars)
+    constrain_new_to_old(model_definition, pars)
 
     # parameter selection