Changeset e65c3ba in sasmodels for sasmodels/modelinfo.py

Timestamp:

Nov 28, 2017 6:09:34 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:

32398dc

Parents:

110f69c

Message:

lint

File:

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

sasmodels/modelinfo.py

@@ -18 +18 @@
 try:
     from typing import Tuple, List, Union, Dict, Optional, Any, Callable, Sequence, Set
+    from types import ModuleType
 except ImportError:
     pass
@@ -499 +500 @@
         for par in self.call_parameters:
             if par.name == key:
-                break
-        else:
-            raise KeyError("unknown parameter %r"%key)
-        return par
+                return par
+        raise KeyError("unknown parameter %r"%key)
 
     def __contains__(self, key):
@@ -508 +507 @@
             if par.name == key:
                 return True
-        else:
-            return False
+        return False
 
     def _set_vector_lengths(self):
@@ -526 +524 @@
         """
         # Sort out the length of the vector parameters such as thickness[n]
-
         for p in self.kernel_parameters:
             if p.length_control:
-                for ref in self.kernel_parameters:
-                    if ref.id == p.length_control:
-                        break
-                else:
-                    raise ValueError("no reference variable %r for %s"
-                                     % (p.length_control, p.name))
+                ref = self._get_ref(p)
                 ref.is_control = True
                 ref.polydisperse = False
@@ -542 +534 @@
                                      % ref.name)
                 p.length = int(high)
+
+    def _get_ref(self, p):
+        # type: (Parameter) -> Parameter
+        for ref in self.kernel_parameters:
+            if ref.id == p.length_control:
+                return ref
+        raise ValueError("no reference variable %r for %s"
+                         % (p.length_control, p.name))
 
     def _get_defaults(self):
@@ -714 +714 @@
 
 def _find_source_lines(model_info, kernel_module):
+    # type: (ModelInfo, ModuleType) -> None
     """
     Identify the location of the C source inside the model definition file.
@@ -967 +968 @@
     #: the SESANS correlation function.  Note: not currently implemented.
     sesans = None           # type: Optional[Callable[[np.ndarray], np.ndarray]]
+    #: Returns a random parameter set for the model
+    random = None           # type: Optional[Callable[[], Dict[str, float]]]
 
     # line numbers within the python file for bits of C source, if defined