Changeset 2f0c07d in sasmodels for sasmodels/generate.py

Timestamp:

Mar 16, 2016 3:07:15 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:

3a45c2c

Parents:

a98958b

Message:

make figure names regular (geometry, angle_definition, angle_projection)

File:

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

sasmodels/generate.py

@@ -672 +672 @@
     * *tests* is a set of tests that must pass
     * *source* is the list of library files to include in the C model build
-    * *Iq*, *Iqxy*, *form_volume*, *ER*, and *VR* are python functions
+    * *Iq*, *Iqxy*, *form_volume*, *ER*, *VR* and *sesans* are python functions
       implementing the kernel for the module, or None if they are not
       defined in python
@@ -682 +682 @@
       *model_info* blocks for the composition objects.  This allows us to
       build complete product and mixture models from just the info.
+
     """
     # TODO: maybe turn model_info into a class ModelDefinition
@@ -710 +711 @@
         )
     process_parameters(model_info)
-    # Fill in available functions
-    model_info.update((k, getattr(kernel_module, k, None))
-                      for k in ('ER', 'VR', 'form_volume', 'Iq', 'Iqxy'))
+    # Check for optional functions
+    functions = "ER VR form_volume Iq Iqxy shape sesans".split()
+    model_info.update((k, getattr(kernel_module, k, None)) for k in functions)
     return model_info