Changeset 86e8e66 in sasmodels for sasmodels/convert.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/convert.py (modified) (4 diffs)

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)