Changeset 7eb2a4d in sasmodels

Timestamp:

Mar 29, 2019 4:52:05 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

ticket-1257-vesicle-product

Children:

eeb772e

Parents:

93cac17

Message:

simplify logic for orientation parameter checks

File:

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

sasmodels/modelinfo.py

@@ -531 +531 @@
                 if p.type != 'orientation':
                     raise TypeError("psi must be an orientation parameter")
-            elif p.type == 'orientation' and strict:
+            elif strict and p.type == 'orientation':
                 raise TypeError("only theta, phi and psi can be orientation parameters")
         if theta >= 0 and phi >= 0:
@@ -540 +540 @@
                 raise TypeError("psi must follow phi")
             # TODO: Why must theta/phi/psi be at the end?  Consistency only?
-            if (psi >= 0 and psi != last_par) or (psi < 0 and phi != last_par):
-                if strict:
-                    raise TypeError("orientation parameters must appear at the "
-                                    "end of the parameter table")
+            if strict and phi != last_par and psi != 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")