Changeset ddfe3f17 in sasview


Ignore:
Timestamp:
Sep 15, 2016 8:33:57 AM (5 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 22:31:45)
git-committer:
Piotr Rozyczko <rozyczko@…> (09/15/16 08:33:57)
Message:

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

Location:
src/sas
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/fit/pluginmodel.py

    r9e531f2 rddfe3f17  
    33 
    44class Model1DPlugin(BaseComponent): 
     5    is_multiplicity_model = False 
     6 
    57    ## Name of the model 
    68 
  • src/sas/sasgui/perspectives/fitting/basepage.py

    r6ed67db rddfe3f17  
    21462146                self.temp_multi_functional = True 
    21472147        elif form_factor != None: 
    2148             self.model = form_factor(self.multi_factor) 
     2148            if self.multi_factor is not None: 
     2149                self.model = form_factor(self.multi_factor) 
     2150            else: 
     2151                # old style plugin models do not accept a multiplicity argument 
     2152                self.model = form_factor() 
    21492153        else: 
    21502154            self.model = None 
Note: See TracChangeset for help on using the changeset viewer.