Changeset 16fd9e5 in sasmodels

Timestamp:

Dec 9, 2016 1:48:21 PM (8 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:

01ecc31

Parents:

298621b

Message:

#795: A check for the spherical SLD is now in place and versioning is now based off of the SasView? version being converted from.

File:

• sasmodels/convert.py (modified) (4 diffs)

sasmodels/convert.py

@@ -92 +92 @@
 
 
-def _get_translation_table(model_info, version='4.0.1'):
+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='4.0.1'):
+def _conversion_target(model_name, version='3.1.2'):
     """
     Find the sasmodel name which translates into the sasview name.
@@ -218 +218 @@
         if 'ndensity.upper' in oldpars:
             oldpars['ndensity.upper'] /= 1e15
-    elif name == 'rpa' and version == '4.0.1':
+    elif name == 'rpa' and version == base_version:
         # convert scattering lengths from femtometers to centimeters
         for p in "L1", "L2", "L3", "L4":
@@ -228 +228 @@
                 oldpars[p + ".upper"] /= 1e-13
     elif name == 'spherical_sld' and version == base_version:
-        oldpars["CONTROL"] = 0
-        i = 0
-        while "nu_inter" + str(i) in oldpars:
-            oldpars["CONTROL"] += 1
-            i += 1
+        j = 0
+        while "func_inter" + str(j) in oldpars:
+            name = "func_inter" + str(j)
+            new_name = "shape" + str(j + 1)
+            if oldpars[name] == 'Erf(|nu|*z)':
+                oldpars[new_name] = int(0)
+            elif oldpars[name] == 'RPower(z^|nu|)':
+                oldpars[new_name] = int(1)
+            elif oldpars[name] == 'LPower(z^|nu|)':
+                oldpars[new_name] = int(2)
+            elif oldpars[name] == 'RExp(-|nu|*z)':
+                oldpars[new_name] = int(3)
+            elif oldpars[name] == 'LExp(-|nu|*z)':
+                oldpars[new_name] = int(4)
+            else:
+                oldpars[new_name] = int(0)
+            oldpars.pop(name)
+            oldpars['n_shells'] = str(j + 1)
+            j += 1
     elif name == 'teubner_strey' and version == base_version:
         # basically undoing the entire Teubner-Strey calculations here.