Changeset 85fe7f8 in sasmodels


Ignore:
Timestamp:
Nov 2, 2016 3:58:24 PM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
8977226
Parents:
fa6d6fc
Message:

re-enable sasview after forward conversion and linting updates

Location:
sasmodels
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/compare.py

    rca9e54e r85fe7f8  
    11851185        # Initialize parameter ranges, fixing the 2D parameters for 1D data. 
    11861186        if not opts['is2d']: 
    1187             for p in model_info.parameters.user_parameters(is2d=False): 
     1187            for p in model_info.parameters.user_parameters({}, is2d=False): 
    11881188                for ext in ['', '_pd', '_pd_n', '_pd_nsigma']: 
    11891189                    k = p.name+ext 
  • sasmodels/modelinfo.py

    rbbc2b34 r85fe7f8  
    548548        return full_list 
    549549 
    550     def user_parameters(self, pars=None, is2d=True): 
     550    def user_parameters(self, pars, is2d=True): 
    551551        # type: (Dict[str, float], bool) -> List[Parameter] 
    552552        """ 
  • sasmodels/sasview_model.py

    ra80e64c r85fe7f8  
    5050    """ 
    5151    import sys 
    52     import sas 
     52    import sas   # needed in order to set sas.models 
    5353    import sas.sascalc.fit 
    5454    sys.modules['sas.models'] = sas.sascalc.fit 
     
    5858    from sasmodels.conversion_table import CONVERSION_TABLE 
    5959    for new_name, conversion in CONVERSION_TABLE.items(): 
     60        # CoreShellEllipsoidModel => core_shell_ellipsoid:1 
     61        new_name = new_name.split(':')[0] 
    6062        old_name = conversion[0] 
    6163        module_attrs = {old_name: find_model(new_name)} 
     
    228230    magnetic_params = [] 
    229231    fixed = [] 
    230     for p in model_info.parameters.user_parameters(): 
     232    for p in model_info.parameters.user_parameters({}, is2d=True): 
    231233        if p.type == 'orientation': 
    232234            orientation_params.append(p.name) 
Note: See TracChangeset for help on using the changeset viewer.