Changeset 86e8e66 in sasmodels

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.

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" : {},
-    "3.1.2" : {
+    (4,0,1) : {},
+    (3,1,2) : {
     "adsorbed_layer": [
         "Core2ndMomentModel",

sasmodels/convert.py

@@ -92 +92 @@
 
 
-def _get_translation_table(model_info, version='3.1.2'):
+def _get_translation_table(model_info, version=(3,1,2)):
     _, translation = CONVERSION_TABLE.get(version).get(model_info.id, [None, {}])
     translation = translation.copy()
@@ -145 +145 @@
     return newpars
 
-def _conversion_target(model_name, version='3.1.2'):
+def _conversion_target(model_name, version=(3,1,2)):
     """
     Find the sasmodel name which translates into the sasview name.
@@ -159 +159 @@
     return None
 
-def _hand_convert(name, oldpars, version='3.1.2'):
-    if version == '3.1.2':
+def _hand_convert(name, oldpars, version=(3,1,2)):
+    if version == (3,1,2):
         oldpars = _hand_convert_3_1_2_to_4_1(name, oldpars)
     return oldpars
@@ -316 +316 @@
         newpars = _hand_convert(newname, newpars, version)
         newpars = _convert_pars(newpars, translation)
-        if not model_info.structure_factor:
+        # TODO: Still not convinced this is the best check
+        if not model_info.structure_factor and version == (3,1,2):
             newpars = _rescale_sld(model_info, newpars, 1e6)
         newpars.setdefault('scale', 1.0)

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