Changeset a18c5b3 in sasmodels

Timestamp:

Apr 13, 2016 10:10:43 AM (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:

04dc697

Parents:

793beb3

Message:

code cleanup; make categories work again

File:

• sasmodels/sasview_model.py (modified) (5 diffs)

sasmodels/sasview_model.py

@@ -112 +112 @@
     All the attributes should be immutable to avoid accidents.
     """
-    attrs = {}  # type: Dict[str, Any]
-    attrs['_model_info'] = model_info
-    attrs['name'] = model_info.name
-    attrs['id'] = model_info.id
-    attrs['description'] = model_info.description
-    attrs['category'] = None
 
     # TODO: allow model to override axis labels input/output name/unit
 
-    parameters = model_info.parameters
-
-    #self.is_multifunc = False
+    # Process multiplicity
     non_fittable = []  # type: List[str]
     xlabel = model_info.profile_axes[0] if model_info.profile is not None else ""
     variants = MultiplicityInfo(0, "", [], xlabel)
-    for p in parameters.kernel_parameters:
+    for p in model_info.parameters.kernel_parameters:
         if p.name == model_info.control:
             non_fittable.append(p.name)
@@ -141 +133 @@
             break
 
-    attrs['is_structure_factor'] = model_info.structure_factor
-    attrs['is_form_factor'] = model_info.ER is not None
-    attrs['is_multiplicity_model'] = variants[0] > 1
-    attrs['multiplicity_info'] = variants
-
+    # Organize parameter sets
     orientation_params = []
     magnetic_params = []
     fixed = []
-    for p in parameters.user_parameters():
+    for p in model_info.parameters.user_parameters():
         if p.type == 'orientation':
             orientation_params.append(p.name)
@@ -158 +146 @@
             magnetic_params.append(p.name)
             fixed.append(p.name+".width")
+
+    # Build class dictionary
+    attrs = {}  # type: Dict[str, Any]
+    attrs['_model_info'] = model_info
+    attrs['name'] = model_info.name
+    attrs['id'] = model_info.id
+    attrs['description'] = model_info.description
+    attrs['category'] = model_info.category
+    attrs['is_structure_factor'] = model_info.structure_factor
+    attrs['is_form_factor'] = model_info.ER is not None
+    attrs['is_multiplicity_model'] = variants[0] > 1
+    attrs['multiplicity_info'] = variants
     attrs['orientation_params'] = tuple(orientation_params)
     attrs['magnetic_params'] = tuple(magnetic_params)
     attrs['fixed'] = tuple(fixed)
-
     attrs['non_fittable'] = tuple(non_fittable)
 
@@ -227 +226 @@
     def __init__(self, multiplicity=None):
         # type: () -> None
-        print("initializing", self.name)
-        #raise Exception("first initialization")
-        self._model = None
 
         ## _persistency_dict is used by sas.perspectives.fitting.basepage
@@ -564 +560 @@
             from . import weights
             disperser = weights.dispersers[dispersion.__class__.__name__]
-            dispersion = weights.models[disperser]()
+            dispersion = weights.MODELS[disperser]()
             self.dispersion[parameter] = dispersion.get_pars()
         else: