Changeset f247314 in sasmodels

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

Location:

sasmodels

Files:

• compare.py (modified) (3 diffs)
• convert.json (added)
• convert.py (modified) (4 diffs)
• generate.py (modified) (3 diffs)
• models/cylinder.py (modified) (1 diff)
• product.py (modified) (2 diffs)
• sasview_model.py (modified) (2 diffs)

sasmodels/compare.py

@@ -41 +41 @@
 from .data import plot_theory, empty_data1D, empty_data2D
 from .direct_model import DirectModel
-from .convert import revert_pars, constrain_new_to_old
+from .convert import revert_name, revert_pars, constrain_new_to_old
 
 USAGE = """
@@ -347 +347 @@
 def eval_sasview(model_info, data):
     """
-    Return a model calculator using the SasView fitting engine.
+    Return a model calculator using the pre-4.0 SasView models.
     """
     # importing sas here so that the error message will be that sas failed to
@@ -366 +366 @@
         composition_type, parts = model_info['composition']
         if composition_type == 'product':
-            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
-            P, S = [get_model(p) for p in model_info['oldname']]
+            from sas.models.MultiplicationModel import MultiplicationModel
+            P, S = [get_model(revert_name(p)) for p in parts]
             model = MultiplicationModel(P, S)
         else:
             raise ValueError("sasview mixture models not supported by compare")
     else:
-        model = get_model(model_info['oldname'])
+        model = get_model(revert_name(model_info))
 
     # build a smearer with which to call the model, if necessary

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

sasmodels/generate.py

@@ -153 +153 @@
     parameter list.  *demo* is mostly needed to set the default
     polydispersity values for tests.
-
-    *oldname* is the name of the model in sasview before sasmodels
-    was split into its own package, and *oldpars* is a dictionary
-    of *parameter: old_parameter* pairs defining the new names for
-    the parameters.  This is used by *compare* to check the values
-    of the new model against the values of the old model before
-    you are ready to add the new model to sasmodels.
-
 
 An *model_info* dictionary is constructed from the kernel meta data and
@@ -692 +684 @@
       implementing the kernel for the module, or None if they are not
       defined in python
-    * *oldname* is the model name in pre-4.0 Sasview
-    * *oldpars* is the *{new: old}* parameter translation table
-      from pre-4.0 Sasview
     * *composition* is None if the model is independent, otherwise it is a
       tuple with composition type ('product' or 'mixture') and a list of
@@ -723 +712 @@
         demo=getattr(kernel_module, 'demo', None),
         source=getattr(kernel_module, 'source', []),
-        oldname=getattr(kernel_module, 'oldname', None),
-        oldpars=getattr(kernel_module, 'oldpars', {}),
         tests=getattr(kernel_module, 'tests', []),
         )

sasmodels/models/cylinder.py

@@ -138 +138 @@
             phi_pd=10, phi_pd_n=5)
 
-# For testing against the old sasview models, include the converted parameter
-# names and the target sasview model name.
-oldname = 'CylinderModel'
-oldpars = dict(theta='cyl_theta', phi='cyl_phi', sld='sldCyl', sld_solvent='sldSolv')
-
-
 qx, qy = 0.2 * np.cos(2.5), 0.2 * np.sin(2.5)
 tests = [[{}, 0.2, 0.042761386790780453],

sasmodels/product.py

@@ -42 +42 @@
     if len(set(p.name for p in pars)) != len(pars):
         raise ValueError("Duplicate parameters in %s and %s"%(p_id))
-    # For comparison with sasview, determine the old parameters.
-    oldname = [p_info['oldname'], s_info['oldname']]
-    oldpars = {'scale':'scale_factor'}
-    oldpars.update(p_info['oldpars'])
-    oldpars.update(s_info['oldpars'])
-
     model_info = {}
     model_info['id'] = '*'.join((p_id, s_id))
@@ -63 +57 @@
     #model_info['source'] = []
     # Iq, Iqxy, form_volume, ER, VR and sesans
-    model_info['oldname'] = oldname
-    model_info['oldpars'] = oldpars
     model_info['composition'] = ('product', [p_info, s_info])
     process_parameters(model_info)

sasmodels/sasview_model.py

@@ -32 +32 @@
 
     Returns a class that can be used directly as a sasview model.t
-
-    Defaults to using the new name for a model.  Setting
-    *namestyle='oldname'* will produce a class with a name
-    compatible with SasView.
     """
     model_info = core.load_model_info(model_name)
@@ -60 +56 @@
 
         self.name = model_info['name']
-        self.oldname = model_info['oldname']
         self.description = model_info['description']
         self.category = None