Changes in / [9eb5eca:ccd5f01] in sasmodels

Location:

sasmodels

Files:

• conversion_table.py (modified) (14 diffs)
• convert.py (modified) (8 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 = {
@@ -213 +211 @@
     ],
     "correlation_length": [
-        "CorrLength",
+        "CorrLengthModel",
         {
             "porod_scale": "scale_p",
@@ -301 +299 @@
     ],
     "fractal_core_shell": [
-        "FractalCoreShell",
+        "FractalCoreShellModel",
         {
             "sld_core": "core_sld",
@@ -323 +321 @@
     ],
     "gauss_lorentz_gel": [
-        "GaussLorentzGel",
+        "GaussLorentzGelModel",
         {
             "gauss_scale": "scale_g",
@@ -333 +331 @@
     ],
     "gaussian_peak": [
-        "Peak Gauss Model",
+        "PeakGaussModel",
         {
             "peak_pos": "q0",
@@ -345 +343 @@
             "lorentz_scale": "lScale",
             "guinier_scale": "gScale",
-            "fractal_dim": "FractalExp",
+            "fractal_dim": "scale",
             "cor_length": "zeta",
         }
     ],
     "guinier": [
-        "Guinier",
+        "GuinierModel",
         {
             "rg": "rg"
@@ -356 +354 @@
     ],
     "guinier_porod": [
-        "GuinierPorod",
+        "GuinierPorodModel",
         {
             "s": "dim",
@@ -456 +454 @@
             "d_spacing": "spacing",
             "Caille_parameter": "caille",
-            "Nlayers": "n_plates",
+            "Nlayers": "N_plates",
         }
     ],
@@ -488 +486 @@
     ],
     "lorentz": [
-        "Lorentz",
+        "LorentzModel",
         {
             "cor_length": "length"
@@ -512 +510 @@
     ],
     "mono_gauss_coil": [
-        "Debye",
+        "DebyeModel",
         {
             "rg": "rg",
@@ -566 +564 @@
     ],
     "peak_lorentz": [
-        "Peak Lorentz Model",
+        "PeakLorentzModel",
         {
             "peak_pos": "q0",
@@ -804 +802 @@
     ],
     "two_lorentzian": [
-        "TwoLorentzian",
+        "TwoLorentzianModel",
         {
             "lorentz_scale_1": "scale_1",
@@ -816 +814 @@
     ],
     "two_power_law": [
-        "TwoPowerLaw",
+        "TwoPowerLawModel",
         {
             "coefficent_1": "coef_A",
@@ -826 +824 @@
     ],
     "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",
-               })
+        "UnifiedPowerRgModel",
+        {
+        }
     ],
     "vesicle": [

sasmodels/convert.py

@@ -53 +53 @@
     ("_pd_nsigma", ".nsigmas"),
     ("_pd_type", ".type"),
-    (".lower", ".lower"),
-    (".upper", ".upper"),
-    (".fittable", ".fittable"),
-    (".std", ".std"),
-    (".units", ".units"),
-    ("", "")
     ]
 
@@ -70 +64 @@
     if id.startswith('M0:'):
         return True
+    if id.startswith('volfraction') or id.startswith('radius_effective'):
+        return False
     if '_pd' in id or '.' in id:
         return False
@@ -79 +75 @@
         if p.id == id:
             return p.type == 'sld'
-    return False
+    raise ValueError("unknown parameter %r in conversion"%id)
 
 def _rescale_sld(model_info, pars, scale):
@@ -123 +119 @@
 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 re.search(value_conv, key_par):
+                new_pars[key_par.replace(value_conv, key_conv)] = value_par
+                i += 1
+                break
+            elif re.search("background", key_par) or re.search("scale", key_par):
+                new_pars[key_par] = value_par
+                i += 1
+                break
+        if i != j:
+            new_pars[key_par] = value_par
+            i += 1
+    return new_pars
 
 def _convert_pars(pars, mapping):
@@ -144 +166 @@
                     del newpars[source]
     return newpars
+
 
 def _conversion_target(model_name):
@@ -192 +215 @@
             pd = oldpars['radius.width']*oldpars['radius']/thickness
             oldpars['radius.width'] = pd
-    elif name == 'multilayer_vesicle':
-        if 'scale' in oldpars:
-            oldpars['volfraction'] = oldpars['scale']
-            oldpars['scale'] = 1.0
-        if 'scale.lower' in oldpars:
-            oldpars['volfraction.lower'] = oldpars['scale.lower']
-        if 'scale.upper' in oldpars:
-            oldpars['volfraction.upper'] = oldpars['scale.upper']
-        if 'scale.fittable' in oldpars:
-            oldpars['volfraction.fittable'] = oldpars['scale.fittable']
-        if 'scale.std' in oldpars:
-            oldpars['volfraction.std'] = oldpars['scale.std']
-        if 'scale.units' in oldpars:
-            oldpars['volfraction.units'] = oldpars['scale.units']
     elif name == 'pearl_necklace':
         pass
@@ -227 +236 @@
                 oldpars[p + ".upper"] /= 1e-13
     elif name == 'spherical_sld':
-        oldpars["CONTROL"] = 0
-        i = 0
-        while "nu_inter" + str(i) in oldpars:
-            oldpars["CONTROL"] += 1
-            i += 1
+        oldpars["CONTROL"] += 1
     elif name == 'teubner_strey':
         # basically undoing the entire Teubner-Strey calculations here.
@@ -293 +298 @@
         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: