Changeset cb4ef58 in sasview for src/sas/sasgui/perspectives/fitting/models.py

Timestamp:

Apr 13, 2016 9:23:07 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

16b769b

Parents:

fa4ea80

Message:

remove references to internal _model_info attribute from sasview

File:

• src/sas/sasgui/perspectives/fitting/models.py (modified) (2 diffs)

src/sas/sasgui/perspectives/fitting/models.py

@@ -296 +296 @@
         #Build list automagically from sasmodels package
         for model in load_standard_models():
-            self.model_dictionary[model._model_info['name']] = model
-            if model._model_info['structure_factor'] == True:
+            self.model_dictionary[model.name] = model
+            if model.is_structure_factor:
                 self.struct_list.append(model)
-            if model._model_info['variant_info'] is not None:
+            if model.is_form_factor:
+                self.multiplication_factor.append(model)
+            if model.is_multiplicity_model:
                 self.multi_func_list.append(model)
             else:
-                self.model_name_list.append(model._model_info['name'])
-            if model._model_info['ER'] is not None:
-                self.multiplication_factor.append(model)
+                self.model_name_list.append(model.name)
 
         #Looking for plugins
@@ -387 +387 @@
         Get the multifunctional models
         """
-        for item in self.plugins:
-            try:
-                # check the multiplicity if any
-                if item.multiplicity_info[0] > 1:
-                    self.multi_func_list.append(item)
-            except:
-                # pass to other items
-                pass
+        items = [item for item in self.plugins if item.is_multiplicity_model]
+        self.multi_func_list = items
 
     def get_model_list(self):