Changeset 716abe0 in sasmodels

Timestamp:

Dec 11, 2015 3:58:36 PM (9 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:

e97170c

Parents:

9a66e65

Message:

fix refactored conversion function

File:

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

sasmodels/convert.py

@@ -72 +72 @@
     """
     newpars = pars.copy()
+
     for new, old in mapping.items():
         for pd, dot in PD_DOT:
@@ -80 +81 @@
                     newpars[old+dot] = pars[new+pd]
                 del newpars[new+pd]
+    for k in list(newpars.keys()):
+        for pd, dot in PD_DOT[1:]:  # skip "" => ""
+            if k.endswith(pd):
+                newpars[k[:-len(pd)]+dot] = newpars[k]
+                del newpars[k]
     return newpars