Changeset 88fafac in sasmodels

Timestamp:

Nov 15, 2016 10:32:25 AM (7 years ago)

Author:

krzywon

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

8d06779

Parents:

8c65a33

Message:

#795: convert.py converts old style models to new style while keeping legacy funcitons in tact.

File:

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

sasmodels/convert.py

@@ -54 +54 @@
     ("_pd_type", ".type"),
     ]
+
+CONVERT_OLD =[
+    "fittable",
+    "std",
+    "upper",
+    "lower",
+    "units"
+]
 
 def _rescale(par, scale):
@@ -117 +125 @@
 def _pd_to_underscores(pars):
     return dict((_dot_pd_to_underscore_pd(k), v) for k, v in pars.items())
+
+def _convert_name(conv_dict, pars):
+    """
+    Renames parameter values (upper, lower, etc) to v4.0 names
+    :param conv_dict: conversion dictionary mapping new name : old name
+    :param pars: parameters to convert
+    :return:
+    """
+    import re
+    new_pars = {}
+    for key_par, value_par in pars.iteritems():
+        for key_conv, value_conv in conv_dict.iteritems():
+            if re.search(value_conv, key_par):
+                new_pars[key_par.replace(value_conv, key_conv)] = value_par
+                break
+            elif re.search("background", key_par) or re.search("scale", key_par):
+                new_pars[key_par] = value_par
+                break
+    return new_pars
 
 def _convert_pars(pars, mapping):
@@ -193 +220 @@
         if 'ndensity' in oldpars:
             oldpars['ndensity'] /= 1e15
+            oldpars['ndensity.lower'] /= 1e15
+            oldpars['ndensity.upper'] /= 1e15
     elif name == 'rpa':
         # convert scattering lengths from femtometers to centimeters
         for p in "L1", "L2", "L3", "L4":
-            if p in oldpars: oldpars[p] /= 1e-13
+            if p in oldpars:
+                oldpars[p] /= 1e-13
+                oldpars[p + ".lower"] /= 1e-13
+                oldpars[p + ".upper"] /= 1e-13
     elif name == 'spherical_sld':
         oldpars["CONTROL"] += 1
@@ -256 +288 @@
         model_info = load_model_info(newname)
         translation = _get_translation_table(model_info)
-    newpars = _hand_convert(newname, pars.copy())
+    newpars = _convert_name(translation, pars.copy())
+    newpars = _hand_convert(newname, newpars)
     newpars = _convert_pars(newpars, translation)
     newpars = _rescale_sld(model_info, newpars, 1e6)