Changeset bd547d0 in sasmodels


Ignore:
Timestamp:
Oct 3, 2018 1:10:16 PM (6 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
c11d09f
Parents:
610ef23
Message:

restrict magnetic parameters to visible shells. Refs #1188

Location:
sasmodels
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/modelinfo.py

    r610ef23 rbd547d0  
    10161016                         for k in range(control+1, p.length+1) 
    10171017                         if p.length > 1) 
     1018            for p in self.parameters.kernel_parameters: 
     1019                if p.length > 1 and p.type == "sld": 
     1020                    for k in range(control+1, p.length+1): 
     1021                        base = p.id+str(k) 
     1022                        hidden.update((base+"_M0", base+"_mtheta", base+"_mphi")) 
    10181023        return hidden 
  • sasmodels/sasview_model.py

    r610ef23 rbd547d0  
    383383            hidden.add('background') 
    384384            self._model_info.parameters.defaults['background'] = 0. 
     385 
     386        # Update the parameter lists to exclude any hidden parameters 
     387        self.magnetic_params = tuple(pname for pname in self.magnetic_params 
     388                                     if pname not in hidden) 
     389        self.orientation_params = tuple(pname for pname in self.orientation_params 
     390                                        if pname not in hidden) 
    385391 
    386392        self._persistency_dict = {} 
Note: See TracChangeset for help on using the changeset viewer.