Changeset 32e3c9b in sasmodels for sasmodels/convert.py

Timestamp:

Jul 21, 2016 2:08:04 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:

b966a96

Parents:

42356c8

Message:

dll version of magnetic sld

File:

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

sasmodels/convert.py

@@ -7 +7 @@
 import math
 import warnings
-import json
+
+from .conversion_table import CONVERSION_TABLE
 
 # List of models which SasView versions don't contain the explicit 'scale' argument.
@@ -47 +48 @@
     ]
 
-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 dict((_byteify(key, ignore_dicts=True),
-                     _byteify(value, ignore_dicts=True))
-                    for key, value in data.items())
-    # if it's anything else, return it in its original form
-    return data
-
-
 def _convert_pars(pars, mapping):
     """
@@ -93 +62 @@
     return newpars
 
-def _rescale_sld(pars):
-    """
-    rescale all sld parameters in the new model definition by 1e6 so the
-    numbers are nicer.  Relies on the fact that all sld parameters in the
-    new model definition end with sld.
-    """
-    return dict((p, (v*1e6 if p.endswith('sld')
-                     else v*1e-15 if 'ndensity' in p
-                     else v))
-                for p, v in pars.items())
-
 def convert_model(name, pars):
     """
@@ -116 +74 @@
     return [pk*scale for pk in par] if isinstance(par, list) else par*scale
 
-def _unscale_sld(pars):
+def _is_sld(modelinfo, id):
+    if id.startswith('M0:'):
+        return True
+    if (id.endswith('_pd') or id.endswith('_pd_n') or id.endswith('_pd_nsigma')
+            or id.endswith('_pd_width') or id.endswith('_pd_type')):
+        return False
+    for p in modelinfo.parameters.call_parameters:
+        if p.id == id:
+            return p.type == 'sld'
+    # check through kernel parameters in case it is a named as a vector
+    for p in modelinfo.parameters.kernel_parameters:
+        if p.id == id:
+            return p.type == 'sld'
+    raise ValueError("unknown parameter %r in conversion"%id)
+
+def _unscale_sld(modelinfo, pars):
     """
     rescale all sld parameters in the new model definition by 1e6 so the
@@ -122 +95 @@
     new model definition end with sld.
     """
-    return dict((p, (_unscale(v,1e-6) if p.startswith('sld') or p.endswith('sld')
-                     else _unscale(v,1e15) if 'ndensity' in p
-                     else v))
-                for p, v in pars.items())
+    return dict((id, (_unscale(v,1e-6) if _is_sld(modelinfo, id) else v))
+                for id, v in pars.items())
 
 def _remove_pd(pars, key, name):
@@ -164 +135 @@
 
 def revert_name(model_info):
-    _read_conversion_table()
     oldname, oldpars = CONVERSION_TABLE.get(model_info.id, [None, {}])
     return oldname
 
 def _get_translation_table(model_info):
-    _read_conversion_table()
     _, translation = CONVERSION_TABLE.get(model_info.id, [None, {}])
     translation = translation.copy()
@@ -186 +155 @@
 
 def _trim_vectors(model_info, pars, oldpars):
-    _read_conversion_table()
     _, translation = CONVERSION_TABLE.get(model_info.id, [None, {}])
     for p in model_info.parameters.kernel_parameters:
@@ -212 +180 @@
     else:
         translation = _get_translation_table(model_info)
-        oldpars = _revert_pars(_unscale_sld(pars), translation)
+        oldpars = _revert_pars(_unscale_sld(model_info, pars), translation)
         oldpars = _trim_vectors(model_info, pars, oldpars)
 
@@ -243 +211 @@
             _remove_pd(oldpars, 'rimB', name)
             _remove_pd(oldpars, 'rimC', name)
+        elif name == 'polymer_micelle':
+            if 'ndensity' in oldpars:
+                oldpars['ndensity'] *= 1e15
         elif name == 'spherical_sld':
             for k in range(1, int(pars['n_shells'])+1):