Changeset 6afc14b in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Apr 18, 2016 12:02:01 PM (9 years ago)

Author:

gonzalezm

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b768e92

Parents:

70e5f97 (diff), 42585bf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (7 diffs)
• fitpage.py (modified) (4 diffs)
• models.py (modified) (2 diffs)

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

@@ -1896 +1896 @@
                 for model in self.model_list_box[mod_cat]:
                     if 'sasmodels.sasview_model.' in str(model):
-                        str_m = model._model_info['id']
+                        str_m = model.id
                     else:
                         str_m = str(model).split(".")[0]
@@ -1945 +1945 @@
         mlist = []
         for models in list:
-            model = models()
-            name = model.__class__.__name__
-            if models.__name__ != "NoStructure":
-                name = model.name
-                mlist.append((name, models))
+            if models.name != "NoStructure":
+                mlist.append((models.name, models))
 
         # Sort the models
@@ -2099 +2096 @@
         if form_factor != None:
             # set multifactor for Mutifunctional models
-            if form_factor().__class__ in \
-                                        self.model_list_box["Multi-Functions"]:
+            if form_factor.is_multiplicity_model:
                 m_id = self.multifactorbox.GetCurrentSelection()
-                multiplicity = form_factor().multiplicity_info[0]
+                multiplicity = form_factor.multiplicity_info[0]
                 self.multifactorbox.Clear()
                 self._set_multfactor_combobox(multiplicity)
                 self._show_multfactor_combobox()
                 #ToDo:  this info should be called directly from the model
-                text = form_factor().multiplicity_info[1]  # 'No. of Shells: '
+                text = form_factor.multiplicity_info[1]  # 'No. of Shells: '
 
                 self.mutifactor_text.SetLabel(text)
@@ -2117 +2113 @@
                 if self.multi_factor == None:
                     self.multi_factor = 0
-                form_factor = form_factor(int(self.multi_factor))
                 self.multifactorbox.SetSelection(m_id)
                 # Check len of the text1 and max_multiplicity
@@ -2131 +2126 @@
                 else:
                     self.sld_axes = ""
-
             else:
                 self._hide_multfactor_combobox()
                 self.show_sld_button.Hide()
-                form_factor = form_factor()
                 self.multi_factor = None
         else:
@@ -2147 +2140 @@
         if  struct_factor != None:
             from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
-            self.model = MultiplicationModel(form_factor, struct_factor())
+            self.model = MultiplicationModel(form_factor(self.multi_factor),
+                                             struct_factor())
             # multifunctional form factor
             if len(form_factor.non_fittable) > 0:
                 self.temp_multi_functional = True
+        elif form_factor != None:
+            self.model = form_factor(self.multi_factor)
         else:
-            if form_factor != None:
-                self.model = form_factor
-            else:
-                self.model = None
-                return self.model
+            self.model = None
+            return
+
         # check if model has magnetic parameters
         if len(self.model.magnetic_params) > 0:
@@ -2286 +2280 @@
                 parameter's error of fit,
                 parameter's minimum value,
-                parrameter's maximum value ,
+                parameter's maximum value ,
                 parameter's units]
         """

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

@@ -10 +10 @@
 import math
 import time
+
+from sasmodels.weights import MODELS as POLYDISPERSITY_MODELS
+
 from sas.sasgui.guiframe.events import StatusEvent
 from sas.sasgui.guiframe.events import NewPlotEvent
@@ -621 +624 @@
         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 sasmodels.weights
-        self.polydisp =  sasmodels.weights.models
 
         ix = 0
@@ -784 +783 @@
                 disp_box = wx.ComboBox(self, wx.ID_ANY, size=(65, -1),
                                        style=wx.CB_READONLY, name='%s' % name1)
-                for key, value in self.polydisp.iteritems():
+                for key, value in POLYDISPERSITY_MODELS.iteritems():
                     name_disp = str(key)
                     disp_box.Append(name_disp, value)
@@ -948 +947 @@
                 disp_box = wx.ComboBox(self, wx.ID_ANY, size=(65, -1),
                                 style=wx.CB_READONLY, name='%s' % name1)
-                for key, value in self.polydisp.iteritems():
+                for key, value in POLYDISPERSITY_MODELS.iteritems():
                     name_disp = str(key)
                     disp_box.Append(name_disp, value)

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):