Changeset 790b16bb in sasmodels

Timestamp:

Dec 23, 2016 12:55:54 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

119fa13

Parents:

bb584b3 (diff), a297255 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ticket-795' of github.com:sasview/sasmodels into ticket-795

Location:

sasmodels

Files:

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

sasmodels/conversion_table.py

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

sasmodels/convert.py

@@ -93 +93 @@
 
 def _get_translation_table(model_info, version=(3,1,2)):
-    _, translation = CONVERSION_TABLE.get(version).get(model_info.id, [None, {}])
+    _, translation = CONVERSION_TABLE.get(version, {}).get(model_info.id, [None, {}])
     translation = translation.copy()
     for p in model_info.parameters.kernel_parameters:
@@ -154 +154 @@
     """
     for sasmodels_name, [sasview_name, _] in \
-            CONVERSION_TABLE.get(version).items():
+            CONVERSION_TABLE.get(version, {}).items():
         if sasview_name == model_name:
             return sasmodels_name
@@ -302 +302 @@
     keys = sorted(CONVERSION_TABLE.keys())
     for i, version in enumerate(keys):
+        # Don't allow indices outside list
+        next_i = i + 1
+        if next_i == len(keys):
+            next_i = i
         # 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 model_version <= keys[next_i]:
+            newname = _conversion_target(name, version)
+        else:
+            newname = None
         # If no conversion is found, move on
         if newname is None:
@@ -315 +320 @@
             # Can't use _get_translation_table since that will return the 'bare'
             # version.
-            translation = CONVERSION_TABLE.get(version)[newname][1]
+            translation = CONVERSION_TABLE.get(version, {})[newname][1]
         else:
             model_info = load_model_info(newname)

sasmodels/sasview_model.py

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