Changeset 6d6508e in sasmodels for sasmodels/convert.py

Timestamp:

Apr 7, 2016 6:57:33 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

d2fc9a4

Parents:

3707eee

Message:

refactor model_info from dictionary to class

File:

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

sasmodels/convert.py

@@ -153 +153 @@
 def revert_name(model_info):
     _read_conversion_table()
-    oldname, oldpars = CONVERSION_TABLE.get(model_info['id'], [None, {}])
+    oldname, oldpars = CONVERSION_TABLE.get(model_info.id, [None, {}])
     return oldname
 
 def _get_old_pars(model_info):
     _read_conversion_table()
-    oldname, oldpars = CONVERSION_TABLE.get(model_info['id'], [None, {}])
+    oldname, oldpars = CONVERSION_TABLE.get(model_info.id, [None, {}])
     return oldpars
 
@@ -165 +165 @@
     Convert model from new style parameter names to old style.
     """
-    if model_info['composition'] is not None:
-        composition_type, parts = model_info['composition']
+    if model_info.composition is not None:
+        composition_type, parts = model_info.composition
         if composition_type == 'product':
             P, S = parts
@@ -180 +180 @@
 
     # Note: update compare.constrain_pars to match
-    name = model_info['id']
-    if name in MODELS_WITHOUT_SCALE or model_info['structure_factor']:
+    name = model_info.id
+    if name in MODELS_WITHOUT_SCALE or model_info.structure_factor:
         if oldpars.pop('scale', 1.0) != 1.0:
             warnings.warn("parameter scale not used in sasview %s"%name)
-    if name in MODELS_WITHOUT_BACKGROUND or model_info['structure_factor']:
+    if name in MODELS_WITHOUT_BACKGROUND or model_info.structure_factor:
         if oldpars.pop('background', 0.0) != 0.0:
             warnings.warn("parameter background not used in sasview %s"%name)
@@ -225 +225 @@
     Restrict parameter values to those that will match sasview.
     """
-    name = model_info['id']
+    name = model_info.id
     # Note: update convert.revert_model to match
-    if name in MODELS_WITHOUT_SCALE or model_info['structure_factor']:
+    if name in MODELS_WITHOUT_SCALE or model_info.structure_factor:
         pars['scale'] = 1
-    if name in MODELS_WITHOUT_BACKGROUND or model_info['structure_factor']:
+    if name in MODELS_WITHOUT_BACKGROUND or model_info.structure_factor:
         pars['background'] = 0
     # sasview multiplies background by structure factor