r8703 - in /branches/relax_disp: generic_fns/relax_data.py prompt/relax_data.py test_suite/system_tests/relax_disp.py -- January 29, 2009 - 20:28

Author: semor
Date: Thu Jan 29 20:28:48 2009
New Revision: 8703

URL: http://svn.gna.org/viewcvs/relax?rev=8703&view=rev
Log:
Updated a few dosctrings and tried to improve the system test.


Modified:
    branches/relax_disp/generic_fns/relax_data.py
    branches/relax_disp/prompt/relax_data.py
    branches/relax_disp/test_suite/system_tests/relax_disp.py

Modified: branches/relax_disp/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/generic_fns/relax_data.py?rev=8703&r1=8702&r2=8703&view=diff
==============================================================================
--- branches/relax_disp/generic_fns/relax_data.py (original)
+++ branches/relax_disp/generic_fns/relax_data.py Thu Jan 29 20:28:48 2009
@@ -525,9 +525,9 @@
 
 
 def read(ri_label=None, frq_label=None, frq=None, file=None, dir=None, 
file_data=None, mol_name_col=None, res_num_col=0, res_name_col=1, 
spin_num_col=None, spin_name_col=None, data_col=2, error_col=3, sep=None):
-    """Function for reading R1, R2, or NOE relaxation data.
-
-    @param ri_label:        The relaxation data type, ie 'R1', 'R2', or 
'NOE'.
+    """Function for reading R1, R2, NOE, or R2eff relaxation data.
+
+    @param ri_label:        The relaxation data type, ie 'R1', 'R2', 'NOE', 
or 'R2eff'.
     @type ri_label:         str
     @param frq_label:       The field strength label.
     @type frq_label:        str

Modified: branches/relax_disp/prompt/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/prompt/relax_data.py?rev=8703&r1=8702&r2=8703&view=diff
==============================================================================
--- branches/relax_disp/prompt/relax_data.py (original)
+++ branches/relax_disp/prompt/relax_data.py Thu Jan 29 20:28:48 2009
@@ -234,12 +234,12 @@
 
 
     def read(self, ri_label=None, frq_label=None, frq=None, file=None, 
dir=None, mol_name_col=None, res_num_col=0, res_name_col=1, 
spin_num_col=None, spin_name_col=None, data_col=2, error_col=3, sep=None):
-        """Function for reading R1, R2, or NOE relaxation data from a file.
-
-        Keyword Arguments
-        ~~~~~~~~~~~~~~~~~
-
-        ri_label:  The relaxation data type, ie 'R1', 'R2', or 'NOE'.
+        """Function for reading R1, R2, NOE, or R2eff relaxation data from a 
file.
+
+        Keyword Arguments
+        ~~~~~~~~~~~~~~~~~
+
+        ri_label:  The relaxation data type, ie 'R1', 'R2', 'NOE', or 
'R2eff'.
 
         frq_label:  The field strength label.
 

Modified: branches/relax_disp/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/relax_disp.py?rev=8703&r1=8702&r2=8703&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Thu Jan 29 
20:28:48 2009
@@ -90,6 +90,6 @@
         self.relax.interpreter._Relax_data.read('R2eff', '600', 600 * 1e6, 
'r2eff.out', dir=sys.path[-1] + 
"/test_suite/shared_data/curve_fitting_disp/r2eff")
 
         # Test the data.
-        self.assertEqual(cdp.mol[0].res[0].spin[0].r2eff[0], 15.000)
-        self.assertEqual(cdp.mol[0].res[1].spin[0].r2eff[0], 4.2003)
-        self.assertEqual(cdp.mol[0].res[2].spin[0].r2eff[0], 7.2385)
+        self.assertEqual(cdp.mol[0].res[0].spin[0].R2eff_val[0], 15.000)
+        self.assertEqual(cdp.mol[0].res[1].spin[0].R2eff_val[0], 4.2003)
+        self.assertEqual(cdp.mol[0].res[2].spin[0].R2eff_val[0], 7.2385)