Changeset 97cb037 in sasmodels

Timestamp:

Jan 25, 2016 7:42:05 AM (9 years ago)

Author:

piotr

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:

29da213

Parents:

61fd21d

Message:

Converted BEPolyelectrolyte

Location:

sasmodels

Files:

• convert.py (modified) (3 diffs)
• models/be_polyelectrolyte.py (added)
• models/img/be_polyelectrolyte_1d.jpg (added)

sasmodels/convert.py

@@ -3 +3 @@
 """
 import warnings
+
+# List of models which SasView versions don't contain the explicit 'scale' argument.
+# When converting such a model, please update this list.
+MODELS_WITHOUT_SCALE = [
+    'teubner_strey',
+    'broad_peak',
+    'two_lorentzian',
+    'gel_fit',
+    'be_polyelectrolyte',
+]
+
+# List of models which SasView versions don't contain the explicit 'background' argument.
+# When converting such a model, please update this list.
+MODELS_WITHOUT_BACKGROUND = [
+    'guinier',
+]
 
 PD_DOT = [
@@ -98 +114 @@
     # Note: update compare.constrain_pars to match
     name = model_definition.name
-    if name in ('teubner_strey', 'broad_peak', 'two_lorentzian', 'gel_fit'):
+    if name in MODELS_WITHOUT_SCALE:
         if oldpars.pop('scale', 1.0) != 1.0:
             warnings.warn("parameter scale not used in sasview %s"%name)
-    elif name in ('guinier',):
+    elif name in MODELS_WITHOUT_BACKGROUND:
         if oldpars.pop('background', 0.0) != 0.0:
             warnings.warn("parameter background not used in sasview %s"%name)
@@ -125 +141 @@
     # Note: update convert.revert_model to match
     name = model_definition.name
-    if name in ('teubner_strey','broad_peak', 'two_lorentzian', 'gel_fit'):
+    if name in MODELS_WITHOUT_SCALE:
         pars['scale'] = 1
-    elif name in ('guinier',):
+    elif name in MODELS_WITHOUT_BACKGROUND:
         pars['background'] = 0
     elif name == 'pearl_necklace':