Changeset da63656 in sasmodels for sasmodels/modelinfo.py

Timestamp:

May 4, 2016 11:37:42 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:

24d5b30

Parents:

13b99fd (diff), 47e498b (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 branch 'master' into polydisp

Conflicts:

sasmodels/generate.py
sasmodels/kerneldll.py

File:

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

sasmodels/modelinfo.py

@@ -11 +11 @@
 from copy import copy
 from os.path import abspath, basename, splitext
+import inspect
 
 import numpy as np  # type: ignore
@@ -609 +610 @@
     return isinstance(x, str)
 
+
+def _find_source_lines(model_info, kernel_module):
+    """
+    Identify the location of the C source inside the model definition file.
+
+    This code runs through the source of the kernel module looking for
+    lines that start with 'Iq', 'Iqxy' or 'form_volume'.  Clearly there are
+    all sorts of reasons why this might not work (e.g., code commented out
+    in a triple-quoted line block, code built using string concatenation,
+    or code defined in the branch of an 'if' block), but it should work
+    properly in the 95% case, and getting the incorrect line number will
+    be harmless.
+    """
+    # Check if we need line numbers at all
+    if callable(model_info.Iq):
+        return None
+
+    if (model_info.Iq is None
+        and model_info.Iqxy is None
+        and model_info.form_volume is None):
+        return
+
+    # find the defintion lines for the different code blocks
+    source = inspect.getsource(kernel_module)
+    for k, v in enumerate(source.split('\n')):
+        if v.startswith('Iqxy'):
+            model_info._Iqxy_line = k+1
+        elif v.startswith('Iq'):
+            model_info._Iq_line = k+1
+        elif v.startswith('form_volume'):
+            model_info._form_volume_line = k+1
+
+
 def make_model_info(kernel_module):
     # type: (module) -> ModelInfo
@@ -654 +688 @@
     info.control = getattr(kernel_module, 'control', None)
     info.hidden = getattr(kernel_module, 'hidden', None) # type: ignore
+
+    _find_source_lines(info, kernel_module)
 
     return info
@@ -807 +843 @@
     sesans = None           # type: Optional[Callable[[np.ndarray], np.ndarray]]
 
+    # line numbers within the python file for bits of C source, if defined
+    _Iqxy_line = 0
+    _Iq_line = 0
+    _form_volume_line = 0
+
+
     def __init__(self):
         # type: () -> None