Changeset e1ea6b5 in sasmodels

Timestamp:

Dec 2, 2016 2:51:09 PM (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:

9eb5eca

Parents:

077666e

Message:

Streamlined code and have Unified Power Rg and Lamellar PC models loading properly.

Location:

sasmodels

Files:

• conversion_table.py (modified) (2 diffs)
• convert.py (modified) (5 diffs)

sasmodels/conversion_table.py

@@ -8 +8 @@
 """
 
+# TODO: May need to version this for future versions of sasview when
+# TODO: models are reparameterized
 
 CONVERSION_TABLE = {
@@ -825 +827 @@
     "unified_power_Rg": [
         "UnifiedPowerRg",
-        {
-        }
+        dict(((field_new+str(index), field_old+str(index))
+              for field_new, field_old in [("rg", "Rg"),
+                                           ("power", "power"),
+                                           ("G", "G"),
+                                           ("B", "B"),]
+              for index in range(11)),
+             **{
+                   "background": "background",
+                   "scale": "scale",
+               })
     ],
     "vesicle": [

sasmodels/convert.py

@@ -53 +53 @@
     ("_pd_nsigma", ".nsigmas"),
     ("_pd_type", ".type"),
+    (".lower", ".lower"),
+    (".upper", ".upper"),
+    (".fittable", ".fittable"),
+    (".std", ".std"),
+    (".units", ".units"),
+    ("", "")
     ]
 
@@ -117 +123 @@
 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:
-    """
-    new_pars = {}
-    i = 0
-    j = 0
-    for key_par, value_par in pars.iteritems():
-        j += 1
-        for key_conv, value_conv in conv_dict.iteritems():
-            if value_conv is None:
-                pass
-            elif "background" == key_par or "scale" == key_par:
-                new_pars[key_par] = value_par
-                i += 1
-                break
-            elif re.search(value_conv, key_par):
-                new_pars[key_par.replace(value_conv, key_conv)] = value_par
-                i += 1
-                break
-        if i != j:
-            new_pars[key_par] = value_par
-            i += 1
-    return new_pars
 
 def _convert_pars(pars, mapping):
@@ -166 +144 @@
                     del newpars[source]
     return newpars
-
 
 def _conversion_target(model_name):
@@ -215 +192 @@
             pd = oldpars['radius.width']*oldpars['radius']/thickness
             oldpars['radius.width'] = pd
-    elif name == 'mono_gauss_coil':
-        if 'scale' in oldpars:
-            oldpars['i_zero'] = oldpars['scale']
-            oldpars['scale'] = 1.0
-        if 'scale.lower' in oldpars:
-            oldpars['i_zero.lower'] = oldpars['scale.lower']
-        if 'scale.upper' in oldpars:
-            oldpars['i_zero.upper'] = oldpars['scale.upper']
-        if 'scale.fittable' in oldpars:
-            oldpars['i_zero.fittable'] = oldpars['scale.fittable']
-        if 'scale.std' in oldpars:
-            oldpars['i_zero.std'] = oldpars['scale.std']
-        if 'scale.units' in oldpars:
-            oldpars['i_zero.units'] = oldpars['scale.units']
     elif name == 'multilayer_vesicle':
         if 'scale' in oldpars:
@@ -330 +293 @@
         translation = _get_translation_table(model_info)
     newpars = _hand_convert(newname, pars.copy())
-    newpars = _convert_name(translation, newpars)
     newpars = _convert_pars(newpars, translation)
     if not model_info.structure_factor: