Author: bugman
Date: Wed Dec 3 10:03:50 2014
New Revision: 26909
URL: http://svn.gna.org/viewcvs/relax?rev=26909&view=rev
Log:
Better checking for the non-moving domain setup.
The frame_order.pdb_model user function will now raise a RelaxError if the
frame_order.ref_domain
user function has not been called to set up the non-moving domain.
Modified:
branches/frame_order_cleanup/specific_analyses/frame_order/data.py
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py
Modified: branches/frame_order_cleanup/specific_analyses/frame_order/data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/data.py?rev=26909&r1=26908&r2=26909&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/data.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/data.py Wed Dec
3 10:03:50 2014
@@ -87,9 +87,9 @@
if len(cdp.domain) > 2:
raise RelaxError("Only two domains are supported in the frame order
analysis.")
- # Reference domain not set yet, so return nothing.
+ # Reference domain not set yet.
if not hasattr(cdp, 'ref_domain'):
- return None
+ raise RelaxError("The reference non-moving domain has not been
specified.")
# Loop over the domains.
for id in cdp.domain:
Modified:
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py?rev=26909&r1=26908&r2=26909&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py
Wed Dec 3 10:03:50 2014
@@ -580,7 +580,7 @@
# Checks.
if not hasattr(cdp, 'ref_domain'):
- raise RelaxError("The reference domain has not been set up.")
+ raise RelaxError("The reference non-moving domain has not been
specified.")
if not hasattr(cdp.align_tensors, 'reduction'):
raise RelaxError("The tensor reductions have not been specified.")
for i, tensor in tensor_loop():
_______________________________________________
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
