Changes in / [a69d8cd:ecb485c] in sasmodels

Location:

sasmodels

Files:

• mixture.py (modified) (1 diff)
• modelinfo.py (modified) (4 diffs)

sasmodels/mixture.py

@@ -94 +94 @@
             # If model is a sum model, each constituent model gets its own scale parameter
             scale_prefix = prefix
-            if prefix == '' and hasattr(part,"operation") and part.operation == '*':
+            if prefix == '' and getattr(part, "operation", '') == '*':
                 # `part` is a composition product model. Find the prefixes of
-                # it's parameters to form a new prefix for the scale, eg:
-                # a model with A*B*C will have ABC_scale
+                # it's parameters to form a new prefix for the scale.
+                # For example, a model with A*B*C will have ABC_scale.
                 sub_prefixes = []
                 for param in part.parameters.kernel_parameters:

sasmodels/modelinfo.py

@@ -69 +69 @@
         processed.append(parse_parameter(*p))
     partable = ParameterTable(processed)
+    partable.check_angles()
     return partable
 
@@ -421 +422 @@
         # type: (List[Parameter]) -> None
         self.kernel_parameters = parameters
-        self._check_angles()
         self._set_vector_lengths()
 
@@ -471 +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):
@@ -494 +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")