Changeset f247314 in sasmodels for sasmodels/convert.py

Timestamp:

Apr 4, 2016 5:23:23 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:

ec45c4f

Parents:

204fd9b

Message:

use sasmodels/convert.json for converting new models to old

File:

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

sasmodels/convert.py

@@ -2 +2 @@
 Convert models to and from sasview.
 """
+from os.path import join as joinpath, abspath, dirname
 import warnings
+import json
 
 # List of models which SasView versions don't contain the explicit 'scale' argument.
@@ -26 +28 @@
 ]
 
+# Convert new style names for polydispersity info to old style names
 PD_DOT = [
     ("", ""),
@@ -33 +36 @@
     ("_pd_type", ".type"),
     ]
+
+CONVERSION_TABLE = None
+
+def _read_conversion_table():
+    global CONVERSION_TABLE
+    if CONVERSION_TABLE is None:
+        path = joinpath(dirname(abspath(__file__)), "convert.json")
+        with open(path) as fid:
+            CONVERSION_TABLE = json_load_byteified(fid)
+
+def json_load_byteified(file_handle):
+    return _byteify(
+        json.load(file_handle, object_hook=_byteify),
+        ignore_dicts=True
+    )
+
+def _byteify(data, ignore_dicts = False):
+    # if this is a unicode string, return its string representation
+    if isinstance(data, unicode):
+        return data.encode('utf-8')
+    # if this is a list of values, return list of byteified values
+    if isinstance(data, list):
+        return [ _byteify(item, ignore_dicts=True) for item in data ]
+    # if this is a dictionary, return dictionary of byteified keys and values
+    # but only if we haven't already byteified it
+    if isinstance(data, dict) and not ignore_dicts:
+        return {
+            _byteify(key, ignore_dicts=True): _byteify(value, ignore_dicts=True)
+            for key, value in data.iteritems()
+        }
+    # if it's anything else, return it in its original form
+    return data
+
+
 def _convert_pars(pars, mapping):
     """
@@ -114 +151 @@
     return newpars
 
+def revert_name(model_info):
+    _read_conversion_table()
+    oldname, oldpars = CONVERSION_TABLE.get(model_info['id'], [None, {}])
+    return oldname
+
+def _get_old_pars(model_info):
+    _read_conversion_table()
+    oldname, oldpars = CONVERSION_TABLE.get(model_info['id'], [None, {}])
+    return oldpars
+
 def revert_pars(model_info, pars):
     """
     Convert model from new style parameter names to old style.
     """
-    mapping = model_info['oldpars']
-    oldpars = _revert_pars(_unscale_sld(pars), mapping)
+    if model_info['composition'] is not None:
+        composition_type, parts = model_info['composition']
+        if composition_type == 'product':
+            P, S = parts
+            oldpars = {'scale':'scale_factor'}
+            oldpars.update(_get_old_pars(P))
+            oldpars.update(_get_old_pars(S))
+        else:
+            raise NotImplementedError("cannot convert to sasview sum")
+    else:
+        oldpars = _get_old_pars(model_info)
+    oldpars = _revert_pars(_unscale_sld(pars), oldpars)
+
 
     # Note: update compare.constrain_pars to match