Changeset 47fafe9 in sasmodels

Timestamp:

Nov 16, 2016 3:41:33 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:

f8f5a37

Parents:

8d06779

Message:

#795: Old style structure factors are now loaded in properly.

File:

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

sasmodels/convert.py

@@ -4 +4 @@
 from __future__ import print_function, division
 
+import re
 import math
 import warnings
@@ -72 +73 @@
     if id.startswith('M0:'):
         return True
+    if id.startswith('volfraction') or id.startswith('radius_effective'):
+        return False
     if '_pd' in id or '.' in id:
         return False
@@ -133 +136 @@
     :return:
     """
-    import re
     new_pars = {}
+    i = 0
+    j = 0
     for key_par, value_par in pars.iteritems():
+        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
+                i += 1
                 break
             elif re.search("background", key_par) or re.search("scale", key_par):
                 new_pars[key_par] = value_par
+                i += 1
                 break
+        if i != j:
+            new_pars[key_par] = value_par
+            i += 1
     return new_pars
 
@@ -295 +305 @@
     newpars = _hand_convert(newname, newpars)
     newpars = _convert_pars(newpars, translation)
-    newpars = _rescale_sld(model_info, newpars, 1e6)
+    if not model_info.structure_factor:
+        newpars = _rescale_sld(model_info, newpars, 1e6)
     newpars.setdefault('scale', 1.0)
     newpars.setdefault('background', 0.0)