Changeset e39202b in sasmodels

Timestamp:

Oct 4, 2018 2:20:18 AM (6 years ago)

Author:

GitHub <noreply@…>

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 (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 02:20:18)

git-committer:

GitHub <noreply@…> (10/04/18 02:20:18)

Message:

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

Ticket 1189: restrict magnetic parameters to visible shells

Location:

sasmodels

Files:

• modelinfo.py (modified) (1 diff)
• sasview_model.py (modified) (1 diff)

sasmodels/modelinfo.py

@@ -1016 +1016 @@
                          for k in range(control+1, p.length+1)
                          if p.length > 1)
+            for p in self.parameters.kernel_parameters:
+                if p.length > 1 and p.type == "sld":
+                    for k in range(control+1, p.length+1):
+                        base = p.id+str(k)
+                        hidden.update((base+"_M0", base+"_mtheta", base+"_mphi"))
         return hidden

sasmodels/sasview_model.py

@@ -383 +383 @@
             hidden.add('background')
             self._model_info.parameters.defaults['background'] = 0.
+
+        # Update the parameter lists to exclude any hidden parameters
+        self.magnetic_params = tuple(pname for pname in self.magnetic_params
+                                     if pname not in hidden)
+        self.orientation_params = tuple(pname for pname in self.orientation_params
+                                        if pname not in hidden)
 
         self._persistency_dict = {}