Changes in sasmodels/convert.py [78f8308:610ef23] in sasmodels

File:

• sasmodels/convert.py (modified) (1 diff)

sasmodels/convert.py

@@ -166 +166 @@
         oldpars = _hand_convert_3_1_2_to_4_1(name, oldpars)
     if version < (4, 2, 0):
-        oldpars = _hand_convert_4_1_to_4_2(name, oldpars)
+        oldpars = _rename_magnetic_pars(oldpars)
     return oldpars
 
-def _hand_convert_4_1_to_4_2(name, oldpars):
-    if name in ('bcc_paracrystal', 'fcc_paracrystal', 'sc_paracrystal'):
-        oldpars['lattice_spacing'] = oldpars.pop('dnn')
-        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):