r26910 - in /branches/frame_order_cleanup: specific_analyses/frame_order/uf.py user_functions/frame_order.py -- December 03, 2014 - 10:13

Author: bugman
Date: Wed Dec  3 10:13:17 2014
New Revision: 26910

URL: http://svn.gna.org/viewcvs/relax?rev=26910&view=rev
Log:
Updated the frame_order.ref_domain user function for the current branch 
design.

This user function was quite out of date.  The alignment tensor checks have 
been removed, to allow
this to be used in the absence of base data.  And the user function 
description has been updated.


Modified:
    branches/frame_order_cleanup/specific_analyses/frame_order/uf.py
    branches/frame_order_cleanup/user_functions/frame_order.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=26910&r1=26909&r2=26910&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/uf.py    
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/uf.py    Wed 
Dec  3 10:13:17 2014
@@ -326,14 +326,6 @@
     check_pipe()
     check_domain(domain=ref, escalate=0)
 
-    # Test if the reference domain exists.
-    exists = False
-    for tensor_cont in cdp.align_tensors:
-        if hasattr(tensor_cont, 'domain') and tensor_cont.domain == ref:
-            exists = True
-    if not exists:
-        raise RelaxError("The reference domain cannot be found within any of 
the loaded tensors.")
-
     # Set the reference domain.
     cdp.ref_domain = ref
 

Modified: branches/frame_order_cleanup/user_functions/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/user_functions/frame_order.py?rev=26910&r1=26909&r2=26910&view=diff
==============================================================================
--- branches/frame_order_cleanup/user_functions/frame_order.py  (original)
+++ branches/frame_order_cleanup/user_functions/frame_order.py  Wed Dec  3 
10:13:17 2014
@@ -271,17 +271,17 @@
 
 # The frame_order.ref_domain user function.
 uf = uf_info.add_uf('frame_order.ref_domain')
-uf.title = "Set the reference domain for the '2-domain' Frame Order 
theories."
-uf.title_short = "Reference domain setting."
+uf.title = "Set the reference non-moving domain for the 2-domain frame order 
theories."
+uf.title_short = "Reference non-moving domain set up."
 uf.add_keyarg(
     name = "ref",
     py_type = "str",
-    desc_short = "reference frame",
-    desc = "The domain which will act as the frame of reference.  This is 
only valid for the '2-domain' Frame Order theories."
-)
-# Description.
-uf.desc.append(Desc_container())
-uf.desc[-1].add_paragraph("Prior to optimisation of the '2-domain' Frame 
Order theories, which of the two domains will act as the frame of reference 
must be specified.  This is important for the attachment of cones to domains, 
etc.")
+    desc_short = "non-moving reference domain",
+    desc = "The non-moving domain which will act as the frame of reference."
+)
+# Description.
+uf.desc.append(Desc_container())
+uf.desc[-1].add_paragraph("Prior to optimisation of the frame order model, 
the frame of reference non-moving domain must be specified.  This is 
essential for determining which spins will be used in the analysis, which 
will be shifted to the average position, etc.")
 # Prompt examples.
 uf.desc.append(Desc_container("Prompt examples"))
 uf.desc[-1].add_paragraph("To set up the isotropic cone frame order model 
with 'centre' domain being the frame of reference, type:")
@@ -289,6 +289,7 @@
 uf.backend = ref_domain
 uf.menu_text = "&ref_domain"
 uf.gui_icon = "oxygen.actions.edit-rename"
+uf.wizard_size = (900, 500)
 uf.wizard_image = WIZARD_IMAGE_PATH + 'frame_order.png'