Changeset c036ddb in sasmodels for sasmodels/modelinfo.py

Timestamp:

Aug 7, 2018 10:45:45 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

7e923c2

Parents:

7b0abf8

Message:

refactor so Iq is not needed if Fq is defined

File:

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

sasmodels/modelinfo.py

@@ -417 +417 @@
     # scale and background are implicit parameters
     COMMON = [Parameter(*p) for p in COMMON_PARAMETERS]
+
     def __init__(self, parameters):
         # type: (List[Parameter]) -> None
@@ -440 +441 @@
         self.form_volume_parameters = [p for p in self.kernel_parameters
                                        if p.type == 'volume']
+
         # Theta offset
         offset = 0
@@ -786 +788 @@
     info.category = getattr(kernel_module, 'category', None)
     info.structure_factor = getattr(kernel_module, 'structure_factor', False)
+    # TODO: find Fq by inspection
+    info.have_Fq = getattr(kernel_module, 'have_Fq', False)
     info.profile_axes = getattr(kernel_module, 'profile_axes', ['x', 'y'])
     info.source = getattr(kernel_module, 'source', [])
@@ -909 +913 @@
     #: provided in the file.
     structure_factor = None # type: bool
+    #: True if the model defines an Fq function with signature
+    #: void Fq(double q, double *F1, double *F2, ...)
+    have_Fq = False
     #: List of C source files used to define the model.  The source files
     #: should define the *Iq* function, and possibly *Iqac* or *Iqabc* if the