Changeset 5213d22 in sasview


Ignore:
Timestamp:
Aug 8, 2016 10:31:45 PM (6 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:
b61bd57, e5c09cf, c3e4e213
Parents:
8416a02
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 r5213d22  
    33 
    44class Model1DPlugin(BaseComponent): 
     5    is_multiplicity_model = False 
     6 
    57    ## Name of the model 
    68 
  • src/sas/sasgui/perspectives/fitting/basepage.py

    r6ed67db r5213d22  
    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.