Changeset a0b355b in sasview for src/sas

Timestamp:

Mar 18, 2016 11:54:57 AM (9 years ago)

Author:

ajj

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:

6a9c0e5a

Parents:

6313823

Message:

Fixing polydispersity. Closes #533

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• models.py (modified) (2 diffs)

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

@@ -621 +621 @@
         model_disp = wx.StaticText(self, wx.ID_ANY, 'Function')
         CHECK_STATE = self.cb1.GetValue()
-        import sas.models.dispersion_models
-        self.polydisp = sas.models.dispersion_models.models
+        #import sas.models.dispersion_models
+        #self.polydisp = sas.models.dispersion_models.models
+        import sasmodels.weights
+        self.polydisp =  sasmodels.weights.models
 
         ix = 0

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

@@ -20 +20 @@
 from sas.models.BaseComponent import BaseComponent
 from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
-from sasmodels.sasview_model import make_class
-import sasmodels.core
+from sasmodels import sasview_model,core
 
 
@@ -301 +300 @@
 
         #Build list automagically from sasmodels package
-        for mod_name in sasmodels.core.list_models():
-            try:
-                mod_def = sasmodels.core.load_model_info(mod_name)
-                self.model_dictionary[mod_def['name']] = make_class(mod_def,dtype=None,namestyle='name')
-                if mod_def['structure_factor'] == True:
-                    self.struct_list.append(self.model_dictionary[mod_def['name']])
-                if mod_def['variant_info'] is not None:
-                    self.multi_func_list.append(self.model_dictionary[mod_def['name']])
-                else:
-                    self.model_name_list.append(mod_def['name'])
-                if mod_def['ER'] is not None:
-                    self.multiplication_factor.append(self.model_dictionary[mod_def['name']])
-            except:
-                logging.info("Problem loading %s model" % mod_name)
+        for model in sasview_model.standard_models():
+            self.model_dictionary[model._model_info['name']] = model
+            if model._model_info['structure_factor'] == True:
+                self.struct_list.append(model)
+            if model._model_info['variant_info'] is not None:
+                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)
+
 
         #Looking for plugins