Changeset ea05c87 in sasmodels for sasmodels/generate.py

Timestamp:

Apr 4, 2016 6:47:27 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

1e2a1ba

Parents:

9d96649 (diff), ec45c4f (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.

Message:

Merge remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/models/spherical_sld.py

File:

• sasmodels/generate.py (modified) (3 diffs)

sasmodels/generate.py

@@ -122 +122 @@
     parameter list.  *demo* is mostly needed to set the default
     polydispersity values for tests.
-
-    *oldname* is the name of the model in sasview before sasmodels
-    was split into its own package, and *oldpars* is a dictionary
-    of *parameter: old_parameter* pairs defining the new names for
-    the parameters.  This is used by *compare* to check the values
-    of the new model against the values of the old model before
-    you are ready to add the new model to sasmodels.
-
 
 An *model_info* dictionary is constructed from the kernel meta data and
@@ -710 +702 @@
       implementing the kernel for the module, or None if they are not
       defined in python
-    * *oldname* is the model name in pre-4.0 Sasview
-    * *oldpars* is the *{new: old}* parameter translation table
-      from pre-4.0 Sasview
     * *composition* is None if the model is independent, otherwise it is a
       tuple with composition type ('product' or 'mixture') and a list of
@@ -742 +731 @@
         demo=getattr(kernel_module, 'demo', None),
         source=getattr(kernel_module, 'source', []),
-        oldname=getattr(kernel_module, 'oldname', None),
-        oldpars=getattr(kernel_module, 'oldpars', {}),
         tests=getattr(kernel_module, 'tests', []),
         )