Changeset b3f4831 in sasmodels for sasmodels/convert.py

Timestamp:

Oct 30, 2018 11:07:41 AM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

ticket_1156

Children:

cc8b183

Parents:

5778279 (diff), c6084f1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket_1156

File:

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

sasmodels/convert.py

@@ -167 +167 @@
     if version < (4, 2, 0):
         oldpars = _hand_convert_4_1_to_4_2(name, oldpars)
+        oldpars = _rename_magnetic_pars(oldpars)
     return oldpars
 
@@ -174 +175 @@
         oldpars['lattice_distortion'] = oldpars.pop('d_factor')
     return oldpars
+
+def _rename_magnetic_pars(pars):
+    """
+    Change from M0:par to par_M0, etc.
+    """
+    keys = list(pars.items())
+    for k in keys:
+        if k.startswith('M0:'):
+            pars[k[3:]+'_M0'] = pars.pop(k)
+        elif k.startswith('mtheta:'):
+            pars[k[7:]+'_mtheta'] = pars.pop(k)
+        elif k.startswith('mphi:'):
+            pars[k[5:]+'_mphi'] = pars.pop(k)
+        elif k.startswith('up:'):
+            pars['up_'+k[3:]] = pars.pop(k)
+    return pars
 
 def _hand_convert_3_1_2_to_4_1(name, oldpars):