Author: bugman
Date: Sun Sep 14 13:01:01 2014
New Revision: 25822
URL: http://svn.gna.org/viewcvs/relax?rev=25822&view=rev
Log:
The frame_order.ref_domain user function backend now uses the check_domain()
function.
Modified:
branches/frame_order_cleanup/specific_analyses/frame_order/uf.py
Modified: branches/frame_order_cleanup/specific_analyses/frame_order/uf.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/uf.py?rev=25822&r1=25821&r2=25822&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/uf.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/uf.py Sun Sep
14 13:01:01 2014
@@ -36,6 +36,7 @@
from lib.geometry.rotations import euler_to_R_zyz, R_to_euler_zyz
from lib.warnings import RelaxWarning
from pipe_control import pipes
+from specific_analyses.frame_order.checks import check_domain
from specific_analyses.frame_order.geometric import create_ave_pos,
create_distribution, create_geometric_rep
from specific_analyses.frame_order.parameters import update_model
from specific_analyses.frame_order.variables import MODEL_ISO_CONE,
MODEL_ISO_CONE_FREE_ROTOR, MODEL_ISO_CONE_TORSIONLESS, MODEL_LIST,
MODEL_LIST_FREE_ROTORS, MODEL_LIST_ISO_CONE, MODEL_LIST_PSEUDO_ELLIPSE,
MODEL_LIST_RESTRICTED_TORSION, MODEL_PSEUDO_ELLIPSE,
MODEL_PSEUDO_ELLIPSE_TORSIONLESS, MODEL_RIGID
@@ -339,12 +340,9 @@
@type ref: str
"""
- # Test if the current data pipe exists.
- pipes.test()
-
- # Check that the domain is defined.
- if not hasattr(cdp, 'domain') or ref not in list(cdp.domain.keys()):
- raise RelaxError("The domain '%s' has not been defined. Please use
the domain user function." % ref)
+ # Checks.
+ pipes.test()
+ check_domain(domain=ref, escalate=0)
# Test if the reference domain exists.
exists = False
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
