Changeset e39202b in sasmodels


Ignore:
Timestamp:
Oct 4, 2018 4:20:18 AM (2 months ago)
Author:
GitHub <noreply@…>
Branches:
master, beta_approx, cuda-test, py3, ticket-1015-gpu-mem-error, ticket-1015-quick-fix, ticket-1157, ticket-608-user-defined-weights, ticket_1156
Children:
a4f1a73
Parents:
610ef23 (diff), bd547d0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Wojciech Potrzebowski <Wojciech.Potrzebowski@…> (10/04/18 04:20:18)
git-committer:
GitHub <noreply@…> (10/04/18 04:20:18)
Message:

Merge pull request #85 from SasView?/ticket-1188-magnetic_shells

Ticket 1189: restrict magnetic parameters to visible shells

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.