Changeset 256dfe1 in sasmodels for sasmodels/convert.py

Timestamp:

Jul 18, 2016 12:42:29 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

c5ac2b2

Parents:

46ed760

Message:

allow comparison of multiplicity models with sasview 3.x

File:

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

sasmodels/convert.py

@@ -2 +2 @@
 Convert models to and from sasview.
 """
+from __future__ import print_function
+
 from os.path import join as joinpath, abspath, dirname
 import warnings
@@ -28 +30 @@
 ]
 
+MODELS_WITHOUT_VOLFRACTION = [
+    'fractal',
+    'vesicle',
+    'multilayer_vesicle',
+    'core_multi_shell',
+]
+
+
 # Convert new style names for polydispersity info to old style names
 PD_DOT = [
@@ -103 +113 @@
     # model name mapping
 
+def _unscale(par, scale):
+    return [pk*scale for pk in par] if isinstance(par, list) else par*scale
+
 def _unscale_sld(pars):
     """
@@ -109 +122 @@
     new model definition end with sld.
     """
-    return dict((p, (v*1e-6 if p.startswith('sld') or p.endswith('sld')
-                     else v*1e15 if 'ndensity' in p
+    return dict((p, (_unscale(v,1e-6) if p.startswith('sld') or p.endswith('sld')
+                     else _unscale(v,1e15) if 'ndensity' in p
                      else v))
                 for p, v in pars.items())
@@ -155 +168 @@
     return oldname
 
-def _get_old_pars(model_info):
+def _get_translation_table(model_info):
     _read_conversion_table()
-    oldname, oldpars = CONVERSION_TABLE.get(model_info.id, [None, {}])
+    _, translation = CONVERSION_TABLE.get(model_info.id, [None, {}])
+    translation = translation.copy()
+    for p in model_info.parameters.kernel_parameters:
+        if p.length > 1:
+            newid = p.id
+            oldid = translation.get(p.id, p.id)
+            del translation[newid]
+            for k in range(1, p.length+1):
+                translation[newid+str(k)] = oldid+str(k)
+    # Remove control parameter from the result
+    if model_info.control:
+        translation[model_info.control] = None
+    return translation
+
+def _trim_vectors(model_info, pars, oldpars):
+    _read_conversion_table()
+    _, translation = CONVERSION_TABLE.get(model_info.id, [None, {}])
+    for p in model_info.parameters.kernel_parameters:
+        if p.length_control is not None:
+            n = int(pars[p.length_control])
+            oldname = translation.get(p.id, p.id)
+            for k in range(n+1, p.length+1):
+                for _, old in PD_DOT:
+                    oldpars.pop(oldname+str(k)+old, None)
     return oldpars
 
@@ -174 +210 @@
             raise NotImplementedError("cannot convert to sasview sum")
     else:
-        oldpars = _get_old_pars(model_info)
-    oldpars = _revert_pars(_unscale_sld(pars), oldpars)
+        translation = _get_translation_table(model_info)
+    oldpars = _revert_pars(_unscale_sld(pars), translation)
+    oldpars = _trim_vectors(model_info, pars, oldpars)
 
 
@@ -194 +231 @@
     namelist = name.split('*') if '*' in name else [name]
     for name in namelist:
+        if name in MODELS_WITHOUT_VOLFRACTION:
+            del oldpars['volfraction']
         if name == 'stacked_disks':
             _remove_pd(oldpars, 'n_stacking', name)
@@ -211 +250 @@
         elif name in ['mono_gauss_coil','poly_gauss_coil']:
             del oldpars['i_zero']
-        elif name == 'fractal':
-            del oldpars['volfraction']
-        elif name == 'vesicle':
-            del oldpars['volfraction']
-        elif name == 'multilayer_vesicle':
-            del oldpars['volfraction']
 
     return oldpars
@@ -240 +273 @@
     namelist = name.split('*') if '*' in name else [name]
     for name in namelist:
+        if name in MODELS_WITHOUT_VOLFRACTION:
+            pars['volfraction'] = 1
         if name == 'pearl_necklace':
             pars['string_thickness_pd_n'] = 0
@@ -252 +287 @@
         elif name == 'poly_gauss_coil':
             pars['i_zero'] = 1
-        elif name == 'fractal':
-            pars['volfraction'] = 1
-        elif name == 'vesicle':
-            pars['volfraction'] = 1
-        elif name == 'multilayer_vesicle':
-            pars['volfraction'] = 1
-            
+