Changeset 5e2fd41 in sasmodels for sasmodels/modelinfo.py

Timestamp:

Mar 9, 2017 6:46:17 PM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

4f9e288

Parents:

0011ecc (diff), 9c44b7b (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:

Paul Kienzle <pkienzle@…> (03/09/17 18:46:17)

git-committer:

GitHub <noreply@…> (03/09/17 18:46:17)

Message:

Merge pull request #27 from SasView?/ticket-843

ticket-843/870: fix multilayer vesicle polydispersity, docs and parameter names; fixes P*S when parameter names collide. Fixes 843, 870.

File:

• sasmodels/modelinfo.py (modified) (2 diffs)

sasmodels/modelinfo.py

@@ -230 +230 @@
     defined as a sublist with the following elements:
 
-    *name* is the name that will be used in the call to the kernel
-    function and the name that will be displayed to the user.  Names
+    *name* is the name that will be displayed to the user.  Names
     should be lower case, with words separated by underscore.  If
-    acronyms are used, the whole acronym should be upper case.
+    acronyms are used, the whole acronym should be upper case. For vector
+    parameters, the name will be followed by *[len]* where *len* is an
+    integer length of the vector, or the name of the parameter which
+    controls the length.  The attribute *id* will be created from name
+    without the length.
 
     *units* should be one of *degrees* for angles, *Ang* for lengths,
@@ -603 +606 @@
         # Using the call_parameters table, we already have expanded forms
         # for each of the vector parameters; put them in a lookup table
-        expanded_pars = dict((p.name, p) for p in self.call_parameters)
+        # Note: p.id and p.name are currently identical for the call parameters
+        expanded_pars = dict((p.id, p) for p in self.call_parameters)
 
         def append_group(name):