Changeset 86e8e66 in sasmodels for sasmodels/sasview_model.py

Timestamp:

Dec 20, 2016 12:08:41 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:

0795293

Parents:

54fb5d8

Message:

Changed conversion table keys to tuples to enforce proper ordering when version ≥ 10. Changed load old models to only check for 3.1.2 models.

File:

• sasmodels/sasview_model.py (modified) (1 diff)

sasmodels/sasview_model.py

@@ -57 +57 @@
     import sas.models
     from sasmodels.conversion_table import CONVERSION_TABLE
-    for version, _ in sorted(CONVERSION_TABLE.iteritems()):
-        for new_name, conversion in CONVERSION_TABLE.get(version).items():
-            # CoreShellEllipsoidModel => core_shell_ellipsoid:1
-            new_name = new_name.split(':')[0]
-            old_name = conversion[0]
-            module_attrs = {old_name: find_model(new_name)}
-            ConstructedModule = type(old_name, (), module_attrs)
-            old_path = 'sas.models.' + old_name
-            setattr(sas.models, old_path, ConstructedModule)
-            sys.modules[old_path] = ConstructedModule
+    for new_name, conversion in CONVERSION_TABLE.get((3,1,2)).items():
+        # CoreShellEllipsoidModel => core_shell_ellipsoid:1
+        new_name = new_name.split(':')[0]
+        old_name = conversion[0]
+        module_attrs = {old_name: find_model(new_name)}
+        ConstructedModule = type(old_name, (), module_attrs)
+        old_path = 'sas.models.' + old_name
+        setattr(sas.models, old_path, ConstructedModule)
+        sys.modules[old_path] = ConstructedModule