Changes in sasmodels/modelinfo.py [5ab99b7:95498a3] in sasmodels

File:

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

sasmodels/modelinfo.py

@@ -12 +12 @@
 from os.path import abspath, basename, splitext
 import inspect
-import logging
 
 import numpy as np  # type: ignore
-
-from . import autoc
 
 # Optional typing
@@ -36 +33 @@
 # pylint: enable=unused-import
 
-logger = logging.getLogger(__name__)
-
 # If MAX_PD changes, need to change the loop macros in kernel_iq.c
 MAX_PD = 5 #: Maximum number of simultaneously polydisperse parameters
@@ -74 +69 @@
         processed.append(parse_parameter(*p))
     partable = ParameterTable(processed)
+    partable.check_angles()
     return partable
 
@@ -426 +422 @@
         # type: (List[Parameter]) -> None
         self.kernel_parameters = parameters
-        self._check_angles()
         self._set_vector_lengths()
 
@@ -476 +471 @@
         self.pd_2d = set(p.name for p in self.call_parameters if p.polydisperse)
 
-    def _check_angles(self):
+    def check_angles(self):
+        """
+        Check that orientation angles are theta, phi and possibly psi.
+        """
         theta = phi = psi = -1
         for k, p in enumerate(self.kernel_parameters):
@@ -499 +497 @@
             if psi >= 0 and psi != phi+1:
                 raise TypeError("psi must follow phi")
-            #if (psi >= 0 and psi != last_par) or (psi < 0 and phi != last_par):
-            #    raise TypeError("orientation parameters must appear at the "
-            #                    "end of the parameter table")
+            if (psi >= 0 and psi != last_par) or (psi < 0 and phi != last_par):
+                raise TypeError("orientation parameters must appear at the "
+                                "end of the parameter table")
         elif theta >= 0 or phi >= 0 or psi >= 0:
             raise TypeError("oriented shapes must have both theta and phi and maybe psi")
@@ -809 +807 @@
     info.sesans = getattr(kernel_module, 'sesans', None) # type: ignore
     # Default single and opencl to True for C models.  Python models have callable Iq.
+    info.opencl = getattr(kernel_module, 'opencl', not callable(info.Iq))
+    info.single = getattr(kernel_module, 'single', not callable(info.Iq))
     info.random = getattr(kernel_module, 'random', None)
 
@@ -817 +817 @@
     info.hidden = getattr(kernel_module, 'hidden', None) # type: ignore
 
+    if callable(info.Iq) and parameters.has_2d:
+        raise ValueError("oriented python models not supported")
+
     info.lineno = {}
     _find_source_lines(info, kernel_module)
-    if getattr(kernel_module, 'py2c', False):
-        try:
-            autoc.convert(info, kernel_module)
-        except Exception as exc:
-            logger.warn(str(exc) + " while converting %s from C to python"%name)
-
-    # Needs to come after autoc.convert since the Iq symbol may have been
-    # converted from python to C
-    info.opencl = getattr(kernel_module, 'opencl', not callable(info.Iq))
-    info.single = getattr(kernel_module, 'single', not callable(info.Iq))
-
-    if callable(info.Iq) and parameters.has_2d:
-        raise ValueError("oriented python models not supported")
 
     return info