Changeset 077666e in sasmodels

Timestamp:

Nov 30, 2016 3:31:22 PM (8 years ago)

Author:

krzywon

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

e1ea6b5

Parents:

d2fb4af

Message:

#795: Gel fit, Lamellar Caille, Debye, and Spherical SLD issues resolved.

Location:

sasmodels

Files:

• conversion_table.py (modified) (2 diffs)
• convert.py (modified) (2 diffs)

sasmodels/conversion_table.py

@@ -343 +343 @@
             "lorentz_scale": "lScale",
             "guinier_scale": "gScale",
-            "fractal_dim": "scale",
+            "fractal_dim": "FractalExp",
             "cor_length": "zeta",
         }
@@ -454 +454 @@
             "d_spacing": "spacing",
             "Caille_parameter": "caille",
-            "Nlayers": "N_plates",
+            "Nlayers": "n_plates",
         }
     ],

sasmodels/convert.py

@@ -131 +131 @@
         j += 1
         for key_conv, value_conv in conv_dict.iteritems():
-            if re.search(value_conv, key_par):
-                new_pars[key_par.replace(value_conv, key_conv)] = value_par
+            if value_conv is None:
+                pass
+            elif "background" == key_par or "scale" == key_par:
+                new_pars[key_par] = value_par
                 i += 1
                 break
-            elif "background" == key_par or "scale" == key_par:
-                new_pars[key_par] = value_par
+            elif re.search(value_conv, key_par):
+                new_pars[key_par.replace(value_conv, key_conv)] = value_par
                 i += 1
                 break
@@ -213 +215 @@
             pd = oldpars['radius.width']*oldpars['radius']/thickness
             oldpars['radius.width'] = pd
+    elif name == 'mono_gauss_coil':
+        if 'scale' in oldpars:
+            oldpars['i_zero'] = oldpars['scale']
+            oldpars['scale'] = 1.0
+        if 'scale.lower' in oldpars:
+            oldpars['i_zero.lower'] = oldpars['scale.lower']
+        if 'scale.upper' in oldpars:
+            oldpars['i_zero.upper'] = oldpars['scale.upper']
+        if 'scale.fittable' in oldpars:
+            oldpars['i_zero.fittable'] = oldpars['scale.fittable']
+        if 'scale.std' in oldpars:
+            oldpars['i_zero.std'] = oldpars['scale.std']
+        if 'scale.units' in oldpars:
+            oldpars['i_zero.units'] = oldpars['scale.units']
+    elif name == 'multilayer_vesicle':
+        if 'scale' in oldpars:
+            oldpars['volfraction'] = oldpars['scale']
+            oldpars['scale'] = 1.0
+        if 'scale.lower' in oldpars:
+            oldpars['volfraction.lower'] = oldpars['scale.lower']
+        if 'scale.upper' in oldpars:
+            oldpars['volfraction.upper'] = oldpars['scale.upper']
+        if 'scale.fittable' in oldpars:
+            oldpars['volfraction.fittable'] = oldpars['scale.fittable']
+        if 'scale.std' in oldpars:
+            oldpars['volfraction.std'] = oldpars['scale.std']
+        if 'scale.units' in oldpars:
+            oldpars['volfraction.units'] = oldpars['scale.units']
     elif name == 'pearl_necklace':
         pass