Changeset 6d6508e in sasmodels for sasmodels/mixture.py

Timestamp:

Apr 7, 2016 4: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/mixture.py (modified) (3 diffs)

sasmodels/mixture.py

@@ -14 +14 @@
 import numpy as np
 
-from .modelinfo import Parameter, ParameterTable
-
-SCALE=0
-BACKGROUND=1
-EFFECT_RADIUS=2
-VOLFRACTION=3
+from .modelinfo import Parameter, ParameterTable, ModelInfo
 
 def make_mixture_info(parts):
@@ -50 +45 @@
     partable = ParameterTable(pars)
 
-    model_info = {}
-    model_info['id'] = '+'.join(part['id'])
-    model_info['name'] = ' + '.join(part['name'])
-    model_info['filename'] = None
-    model_info['title'] = 'Mixture model with ' + model_info['name']
-    model_info['description'] = model_info['title']
-    model_info['docs'] = model_info['title']
-    model_info['category'] = "custom"
-    model_info['parameters'] = partable
-    #model_info['single'] = any(part['single'] for part in parts)
-    model_info['structure_factor'] = False
-    model_info['variant_info'] = None
-    #model_info['tests'] = []
-    #model_info['source'] = []
+    model_info = ModelInfo()
+    model_info.id = '+'.join(part['id'])
+    model_info.name = ' + '.join(part['name'])
+    model_info.filename = None
+    model_info.title = 'Mixture model with ' + model_info.name
+    model_info.description = model_info.title
+    model_info.docs = model_info.title
+    model_info.category = "custom"
+    model_info.parameters = partable
+    #model_info.single = any(part['single'] for part in parts)
+    model_info.structure_factor = False
+    model_info.variant_info = None
+    #model_info.tests = []
+    #model_info.source = []
     # Iq, Iqxy, form_volume, ER, VR and sesans
     # Remember the component info blocks so we can build the model
-    model_info['composition'] = ('mixture', parts)
+    model_info.composition = ('mixture', parts)
 
 
@@ -108 +103 @@
         if dim == '2d':
             for p in kernels:
-                partype = p.info['partype']
+                partype = p.info.partype
                 accumulate(partype['fixed-2d'], partype['pd-2d'], partype['volume'])
         else:
             for p in kernels:
-                partype = p.info['partype']
+                partype = p.info.partype
                 accumulate(partype['fixed-1d'], partype['pd-1d'], partype['volume'])