Changeset 4b4eee1 in sasmodels

Timestamp:

Dec 5, 2016 3:36:01 PM (8 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:

298621b

Parents:

9eb5eca

Message:

Added versioning to convert.py for future model reparameterization.

Location:

sasmodels

Files:

• conversion_table.py (modified) (2 diffs)
• convert.py (modified) (12 diffs)
• sasview_model.py (modified) (1 diff)

sasmodels/conversion_table.py

@@ -8 +8 @@
 """
 
-# TODO: May need to version this for future versions of sasview when
-# TODO: models are reparameterized
-
 CONVERSION_TABLE = {
+    "4.1.0" : {},
+    "4.0.1" : {
     "adsorbed_layer": [
         "Core2ndMomentModel",
@@ -845 +844 @@
         }
     ]
+    }
 }

sasmodels/convert.py

@@ -92 +92 @@
 
 
-def _get_translation_table(model_info):
-    _, translation = CONVERSION_TABLE.get(model_info.id, [None, {}])
+def _get_translation_table(model_info, version='4.0.1'):
+    _, translation = CONVERSION_TABLE.get(version).get(model_info.id, [None, {}])
     translation = translation.copy()
     for p in model_info.parameters.kernel_parameters:
@@ -145 +145 @@
     return newpars
 
-def _conversion_target(model_name):
+def _conversion_target(model_name, version='4.0.1'):
     """
     Find the sasmodel name which translates into the sasview name.
@@ -153 +153 @@
     two variants in sasview.
     """
-    for sasmodels_name, [sasview_name, _] in CONVERSION_TABLE.items():
+    for sasmodels_name, [sasview_name, _] in CONVERSION_TABLE.get(version).items():
         if sasview_name == model_name:
             return sasmodels_name
@@ -159 +159 @@
 
 
-def _hand_convert(name, oldpars):
-    if name == 'core_shell_parallelepiped':
+def _hand_convert(name, oldpars, version='4.0.1'):
+    if name == 'core_shell_parallelepiped' and version == '4.0.1':
         # Make sure pd on rim parameters defaults to zero
         # ... probably not necessary.
@@ -166 +166 @@
         oldpars['rimB.width'] = 0.0
         oldpars['rimC.width'] = 0.0
-    elif name == 'core_shell_ellipsoid:1':
+    elif name == 'core_shell_ellipsoid:1' and version == '4.0.1':
         # Reverse translation (from new to old), from core_shell_ellipsoid.c
         #    equat_shell = equat_core + thick_shell
@@ -185 +185 @@
         oldpars['polar_core'] = polar_core / equat_core
         oldpars['polar_shell'] = (polar_shell-polar_core)/(equat_shell-equat_core)
-    elif name == 'hollow_cylinder':
+    elif name == 'hollow_cylinder' and version == '4.0.1':
         # now uses radius and thickness
         thickness = oldpars['radius'] - oldpars['core_radius']
@@ -192 +192 @@
             pd = oldpars['radius.width']*oldpars['radius']/thickness
             oldpars['radius.width'] = pd
-    elif name == 'multilayer_vesicle':
+    elif name == 'multilayer_vesicle' and version == '4.0.1':
         if 'scale' in oldpars:
             oldpars['volfraction'] = oldpars['scale']
@@ -206 +206 @@
         if 'scale.units' in oldpars:
             oldpars['volfraction.units'] = oldpars['scale.units']
-    elif name == 'pearl_necklace':
+    elif name == 'pearl_necklace' and version == '4.0.1':
         pass
         #_remove_pd(oldpars, 'num_pearls', name)
         #_remove_pd(oldpars, 'thick_string', name)
-    elif name == 'polymer_micelle':
+    elif name == 'polymer_micelle' and version == '4.0.1':
         if 'ndensity' in oldpars:
             oldpars['ndensity'] /= 1e15
@@ -217 +217 @@
         if 'ndensity.upper' in oldpars:
             oldpars['ndensity.upper'] /= 1e15
-    elif name == 'rpa':
+    elif name == 'rpa' and version == '4.0.1':
         # convert scattering lengths from femtometers to centimeters
         for p in "L1", "L2", "L3", "L4":
@@ -226 +226 @@
             if p + ".upper" in oldpars:
                 oldpars[p + ".upper"] /= 1e-13
-    elif name == 'spherical_sld':
+    elif name == 'spherical_sld' and version == '4.0.1':
         oldpars["CONTROL"] = 0
         i = 0
@@ -232 +232 @@
             oldpars["CONTROL"] += 1
             i += 1
-    elif name == 'teubner_strey':
+    elif name == 'teubner_strey' and version == '4.0.1':
         # basically undoing the entire Teubner-Strey calculations here.
         #    drho = (sld_a - sld_b)
@@ -280 +280 @@
     Convert model from old style parameter names to new style.
     """
-    newname = _conversion_target(name)
-    if newname is None:
-        return name, pars
-    if ':' in newname:   # core_shell_ellipsoid:1
-        model_info = load_model_info(newname[:-2])
-        # Know that the table exists and isn't multiplicity so grab it directly
-        # Can't use _get_translation_table since that will return the 'bare'
-        # version.
-        translation = CONVERSION_TABLE[newname][1]
-    else:
-        model_info = load_model_info(newname)
-        translation = _get_translation_table(model_info)
-    newpars = _hand_convert(newname, pars.copy())
-    newpars = _convert_pars(newpars, translation)
-    if not model_info.structure_factor:
-        newpars = _rescale_sld(model_info, newpars, 1e6)
-    newpars.setdefault('scale', 1.0)
-    newpars.setdefault('background', 0.0)
-    if use_underscore:
-        newpars = _pd_to_underscores(newpars)
+    newpars = pars
+    for version, _ in sorted(CONVERSION_TABLE.iteritems()):
+        newname = _conversion_target(name, version)
+        if newname is None:
+            newname = name
+            continue
+        if ':' in newname:   # core_shell_ellipsoid:1
+            model_info = load_model_info(newname[:-2])
+            # Know that the table exists and isn't multiplicity so grab it directly
+            # Can't use _get_translation_table since that will return the 'bare'
+            # version.
+            translation = CONVERSION_TABLE.get(version)[newname][1]
+        else:
+            model_info = load_model_info(newname)
+            translation = _get_translation_table(model_info, version)
+        newpars = _hand_convert(newname, newpars, version)
+        newpars = _convert_pars(newpars, translation)
+        if not model_info.structure_factor:
+            newpars = _rescale_sld(model_info, newpars, 1e6)
+        newpars.setdefault('scale', 1.0)
+        newpars.setdefault('background', 0.0)
+        if use_underscore:
+            newpars = _pd_to_underscores(newpars)
+        name = newname
     return newname, newpars
 

sasmodels/sasview_model.py

@@ -57 +57 @@
     import sas.models
     from sasmodels.conversion_table import CONVERSION_TABLE
-    for new_name, conversion in CONVERSION_TABLE.items():
+    for new_name, conversion in CONVERSION_TABLE.get('4.0.1').items():
         # CoreShellEllipsoidModel => core_shell_ellipsoid:1
         new_name = new_name.split(':')[0]