r9084 - /branches/frame_order/specific_fns/setup.py -- June 19, 2009 - 10:18

Author: bugman
Date: Fri Jun 19 10:18:35 2009
New Revision: 9084

URL: http://svn.gna.org/viewcvs/relax?rev=9084&view=rev
Log:
Added the Frame Order theories to the setup of the specific code.


Modified:
    branches/frame_order/specific_fns/setup.py

Modified: branches/frame_order/specific_fns/setup.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order/specific_fns/setup.py?rev=9084&r1=9083&r2=9084&view=diff
==============================================================================
--- branches/frame_order/specific_fns/setup.py (original)
+++ branches/frame_order/specific_fns/setup.py Fri Jun 19 10:18:35 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.                                    
 #
 #                                                                            
 #
@@ -22,6 +22,7 @@
 
 # relax module imports.
 from specific_fns.consistency_tests import Consistency_tests
+from specific_fns.frame_order import Frame_order
 from specific_fns.hybrid import Hybrid
 from specific_fns.jw_mapping import Jw_mapping
 from specific_fns.model_free import Model_free
@@ -33,6 +34,7 @@
 
 # Instantiate all classes.
 consistency_tests_obj = Consistency_tests()
+frame_order_obj = Frame_order()
 hybrid_obj = Hybrid()
 jw_mapping_obj = Jw_mapping()
 model_free_obj = Model_free()
@@ -257,6 +259,10 @@
     if function_type == 'ct':
         return consistency_tests_obj
 
+    # The Frame Order theories.
+    if function_type == 'frame order':
+        return frame_order_obj
+
     # NOE calculation.
     if function_type == 'noe':
         return noe_obj