r5054 - /branches/consistency_tests_1.3/specific_fns/setup.py -- February 20, 2008 - 16:15

Author: semor
Date: Wed Feb 20 15:19:10 2008
New Revision: 5054

URL: http://svn.gna.org/viewcvs/relax?rev=5054&view=rev
Log:
Included the consistency tests code into the specific_fns.setup.


Modified:
    branches/consistency_tests_1.3/specific_fns/setup.py

Modified: branches/consistency_tests_1.3/specific_fns/setup.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/specific_fns/setup.py?rev=5054&r1=5053&r2=5054&view=diff
==============================================================================
--- branches/consistency_tests_1.3/specific_fns/setup.py (original)
+++ branches/consistency_tests_1.3/specific_fns/setup.py Wed Feb 20 15:19:10 
2008
@@ -21,6 +21,7 @@
 
###############################################################################
 
 # relax module imports.
+from specific_fns.consistency_tests import Consistency_tests
 from specific_fns.hybrid import Hybrid
 from specific_fns.jw_mapping import Jw_mapping
 from specific_fns.model_free import Model_free
@@ -30,6 +31,7 @@
 
 
 # Instantiate all classes.
+consistency_tests_obj = Consistency_tests()
 hybrid_obj = Hybrid()
 jw_mapping_obj = Jw_mapping()
 model_free_obj = Model_free()
@@ -225,6 +227,10 @@
 def get_instance(function_type):
     """Function for returning the class instance corresponding to the 
function type."""
 
+    # Consistency testing.
+    if function_type == 'ct':
+        return consistency_tests_obj
+
     # NOE calculation.
     if function_type == 'noe':
         return noe_obj
@@ -252,6 +258,10 @@
 def get_string(function_type):
     """Function for returning a string corresponding to the function type."""
 
+    # Consistency testing.
+    if function_type == 'ct':
+        return "consistency testing"
+
     # NOE calculation.
     if function_type == 'noe':
         return "NOE calculations"