r9071 - in /branches/frame_order: generic_fns/pipes.py prompt/pipe.py -- June 17, 2009 - 19:34

Author: bugman
Date: Wed Jun 17 19:34:39 2009
New Revision: 9071

URL: http://svn.gna.org/viewcvs/relax?rev=9071&view=rev
Log:
Added Frame Order to the list of allowable data pipes.


Modified:
    branches/frame_order/generic_fns/pipes.py
    branches/frame_order/prompt/pipe.py

Modified: branches/frame_order/generic_fns/pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order/generic_fns/pipes.py?rev=9071&r1=9070&r2=9071&view=diff
==============================================================================
--- branches/frame_order/generic_fns/pipes.py (original)
+++ branches/frame_order/generic_fns/pipes.py Wed Jun 17 19:34:39 2009
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2004, 2006-2008 Edward d'Auvergne                            
 #
+# Copyright (C) 2004, 2006-2009 Edward d'Auvergne                            
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -70,6 +70,7 @@
     @type pipe_name:    str
     @keyword pipe_type: The new data pipe type which can be one of the 
following:
         'ct':  Consistency testing,
+        'frame order':  The Frame Order theories.
         'jw':  Reduced spectral density mapping,
         'hybrid':  The hybridised data pipe.
         'mf':  Model-free analysis,
@@ -85,7 +86,7 @@
     """
 
     # List of valid data pipe types.
-    valid = ['ct', 'jw', 'hybrid', 'mf', 'N-state', 'noe', 'relax_fit', 
'relax_disp', 'srls']
+    valid = ['ct', 'frame order', 'jw', 'hybrid', 'mf', 'N-state', 'noe', 
'relax_fit', 'relax_disp', 'srls']
 
     # Test if pipe_type is valid.
     if not pipe_type in valid:

Modified: branches/frame_order/prompt/pipe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order/prompt/pipe.py?rev=9071&r1=9070&r2=9071&view=diff
==============================================================================
--- branches/frame_order/prompt/pipe.py (original)
+++ branches/frame_order/prompt/pipe.py Wed Jun 17 19:34:39 2009
@@ -115,6 +115,7 @@
         The data pipe name can be any string however the data pipe type can 
only be one of the
         following:
 
+            'frame order':  The Frame Order theories,
             'jw':  Reduced spectral density mapping,
             'mf':  Model-free analysis,
             'N-state':  N-state model of domain motions,