Changeset ddfe3f17 in sasview

Timestamp:

Sep 15, 2016 6:33:57 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

70b7d778

Parents:

0783a2e

git-author:

Paul Kienzle <pkienzle@…> (08/08/16 20:31:45)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/15/16 06:33:57)

Message:

support old style custom formula models (but not sum or product)

Location:

src/sas

Files:

• sascalc/fit/pluginmodel.py (modified) (1 diff)
• sasgui/perspectives/fitting/basepage.py (modified) (1 diff)

src/sas/sascalc/fit/pluginmodel.py

@@ -3 +3 @@
 
 class Model1DPlugin(BaseComponent):
+    is_multiplicity_model = False
+
     ## Name of the model
 

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

@@ -2146 +2146 @@
                 self.temp_multi_functional = True
         elif form_factor != None:
-            self.model = form_factor(self.multi_factor)
+            if self.multi_factor is not None:
+                self.model = form_factor(self.multi_factor)
+            else:
+                # old style plugin models do not accept a multiplicity argument
+                self.model = form_factor()
         else:
             self.model = None