Changeset 0d99a6a in sasmodels

Timestamp:

Apr 8, 2016 5:52:54 PM (9 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:

e62a134

Parents:

7edce22

Message:

doc strings for modelinfo

Location:

sasmodels

Files:

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

sasmodels/modelinfo.py

@@ +1 @@
+"""
+Model Info and Parameter Tables
+===============================
+
+Defines :class:`ModelInfo` and :class:`ParameterTable` and the routines for
+manipulating them.  In particular, :func:`make_model_info` converts a kernel
+module into the model info block as seen by the rest of the sasmodels library.
+"""
 from copy import copy
 from os.path import abspath, basename, splitext
@@ -506 +514 @@
 
     def user_parameters(self, pars={}, is2d=True):
-        # type: (Dict[str, float], bool) -> List[str]
+        # type: (Dict[str, float], bool) -> List[Parameter]
         """
         Return the list of parameters for the given data type.

sasmodels/sasview_model.py

@@ -64 +64 @@
     """
     kernel_module = generate.load_kernel_module(name)
-    model_info = modelinfo.make_model_info(kernel_module)
+    #model_info = modelinfo.make_model_info(kernel_module)
+    model_info = modelinfo.make_model_info("hello")
     return _make_model_from_info(model_info)