Changeset 54fb5d8 in sasmodels

Timestamp:

Dec 19, 2016 9:59:01 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:

86e8e66

Parents:

01ecc31

Message:

slightly cleaner handling of version specific hand-coded conversions

File:

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

sasmodels/convert.py

@@ -160 +160 @@
 
 def _hand_convert(name, oldpars, version='3.1.2'):
-    base_version = '3.1.2'
-    if name == 'core_shell_parallelepiped' and version == base_version:
+    if version == '3.1.2':
+        oldpars = _hand_convert_3_1_2_to_4_1(name, oldpars)
+    return oldpars
+
+def _hand_convert_3_1_2_to_4_1(name, oldpars):
+    if name == 'core_shell_parallelepiped':
         # Make sure pd on rim parameters defaults to zero
         # ... probably not necessary.
@@ -167 +171 @@
         oldpars['rimB.width'] = 0.0
         oldpars['rimC.width'] = 0.0
-    elif name == 'core_shell_ellipsoid:1' and version == base_version:
+    elif name == 'core_shell_ellipsoid:1':
         # Reverse translation (from new to old), from core_shell_ellipsoid.c
         #    equat_shell = equat_core + thick_shell
@@ -186 +190 @@
         oldpars['polar_core'] = polar_core / equat_core
         oldpars['polar_shell'] = (polar_shell-polar_core)/(equat_shell-equat_core)
-    elif name == 'hollow_cylinder' and version == base_version:
+    elif name == 'hollow_cylinder':
         # now uses radius and thickness
         thickness = oldpars['radius'] - oldpars['core_radius']
@@ -193 +197 @@
             pd = oldpars['radius.width']*oldpars['radius']/thickness
             oldpars['radius.width'] = pd
-    elif name == 'multilayer_vesicle' and version == base_version:
+    elif name == 'multilayer_vesicle':
         if 'scale' in oldpars:
             oldpars['volfraction'] = oldpars['scale']
@@ -207 +211 @@
         if 'scale.units' in oldpars:
             oldpars['volfraction.units'] = oldpars['scale.units']
-    elif name == 'pearl_necklace' and version == base_version:
+    elif name == 'pearl_necklace':
         pass
         #_remove_pd(oldpars, 'num_pearls', name)
         #_remove_pd(oldpars, 'thick_string', name)
-    elif name == 'polymer_micelle' and version == base_version:
+    elif name == 'polymer_micelle':
         if 'ndensity' in oldpars:
             oldpars['ndensity'] /= 1e15
@@ -218 +222 @@
         if 'ndensity.upper' in oldpars:
             oldpars['ndensity.upper'] /= 1e15
-    elif name == 'rpa' and version == base_version:
+    elif name == 'rpa':
         # convert scattering lengths from femtometers to centimeters
         for p in "L1", "L2", "L3", "L4":
@@ -227 +231 @@
             if p + ".upper" in oldpars:
                 oldpars[p + ".upper"] /= 1e-13
-    elif name == 'spherical_sld' and version == base_version:
+    elif name == 'spherical_sld':
         j = 0
         while "func_inter" + str(j) in oldpars:
@@ -247 +251 @@
             oldpars['n_shells'] = str(j + 1)
             j += 1
-    elif name == 'teubner_strey' and version == base_version:
+    elif name == 'teubner_strey':
         # basically undoing the entire Teubner-Strey calculations here.
         #    drho = (sld_a - sld_b)