Changeset 0795293 in sasmodels

Timestamp:

Dec 21, 2016 10:00:35 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:

a297255, bb584b3

Parents:

86e8e66

Message:

Add a check for the version of the incoming pagestate to skip previous versions.

Location:

sasmodels

Files:

• conversion_table.py (modified) (1 diff)
• convert.py (modified) (1 diff)

sasmodels/conversion_table.py

@@ -29 +29 @@
 CONVERSION_TABLE = {
     (4,0,1) : {},
+    (4,0,0) : {},
     (3,1,2) : {
     "adsorbed_layer": [

sasmodels/convert.py

@@ -295 +295 @@
     return oldpars
 
-def convert_model(name, pars, use_underscore=False):
+def convert_model(name, pars, use_underscore=False, model_version=(3,1,2)):
     """
     Convert model from old style parameter names to new style.
     """
     newpars = pars
-    for version, _ in sorted(CONVERSION_TABLE.iteritems()):
+    keys = sorted(CONVERSION_TABLE.keys())
+    for i, version in enumerate(keys):
+        # If the save state is from a later version, skip the check
+        if model_version > version and model_version != keys[i+1]:
+            continue
         newname = _conversion_target(name, version)
+        # If no conversion is found, move on
         if newname is None:
             newname = name