r19244 - in /branches/relax_disp: pipe_control/relax_data.py test_suite/system_tests/relax_disp.py user_functions/relax_data.py -- March 27, 2013 - 15:35

Author: bugman
Date: Wed Mar 27 15:35:20 2013
New Revision: 19244

URL: http://svn.gna.org/viewcvs/relax?rev=19244&view=rev
Log:
Ported r8703 from the old relax_disp branch into the new branch.

The commands used were:
svn merge -r8702:8703 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/generic_fns/@r18123
 pipe_control
svn merge -r8702:8703 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/test_suite/@r18123 
test_suite

The prompt package changes were manually ported to the user_functions package.

.....
  r8703 | semor | 2009-01-29 20:28:48 +0100 (Thu, 29 Jan 2009) | 3 lines
  Changed paths:
     M /branches/relax_disp/generic_fns/relax_data.py
     M /branches/relax_disp/prompt/relax_data.py
     M /branches/relax_disp/test_suite/system_tests/relax_disp.py
  
  Updated a few dosctrings and tried to improve the system test.
.....


Modified:
    branches/relax_disp/pipe_control/relax_data.py
    branches/relax_disp/test_suite/system_tests/relax_disp.py
    branches/relax_disp/user_functions/relax_data.py

Modified: branches/relax_disp/pipe_control/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/relax_data.py?rev=19244&r1=19243&r2=19244&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/relax_data.py (original)
+++ branches/relax_disp/pipe_control/relax_data.py Wed Mar 27 15:35:20 2013
@@ -952,11 +952,11 @@
 
 
 def read(ri_id=None, ri_type=None, frq=None, file=None, dir=None, 
file_data=None, spin_id_col=None, mol_name_col=None, res_num_col=None, 
res_name_col=None, spin_num_col=None, spin_name_col=None, data_col=None, 
error_col=None, sep=None, spin_id=None):
-    """Read R1, R2, or NOE relaxation data from a file.
+    """Read R1, R2, or NOE, or R2eff relaxation data from a file.
 
     @param ri_id:           The relaxation data ID string.
     @type ri_id:            str
-    @param ri_type:         The relaxation data type, ie 'R1', 'R2', or 
'NOE'.
+    @param ri_type:         The relaxation data type, ie 'R1', 'R2', 'NOE', 
or 'R2eff'.
     @type ri_type:          str
     @param frq:             The spectrometer proton frequency in Hz.
     @type frq:              float

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=19244&r1=19243&r2=19244&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/relax_disp.py (original)
+++ branches/relax_disp/test_suite/system_tests/relax_disp.py Wed Mar 27 
15:35:20 2013
@@ -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)

Modified: branches/relax_disp/user_functions/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/relax_data.py?rev=19244&r1=19243&r2=19244&view=diff
==============================================================================
--- branches/relax_disp/user_functions/relax_data.py (original)
+++ branches/relax_disp/user_functions/relax_data.py Wed Mar 27 15:35:20 2013
@@ -41,7 +41,7 @@
 
 # The user function class.
 uf_class = uf_info.add_class('relax_data')
-uf_class.title = "Class for manipulating R1, R2, and NOE relaxation data."
+uf_class.title = "Class for manipulating R1, R2, NOE, or R2eff relaxation 
data."
 uf_class.menu_text = "&relax_data"
 uf_class.gui_icon = "relax.fid"
 
@@ -259,7 +259,7 @@
 
 # The relax_data.read user function.
 uf = uf_info.add_uf('relax_data.read')
-uf.title = "Read R1, R2, or NOE relaxation data from a file."
+uf.title = "Read R1, R2, NOE, or R2eff relaxation data from a file."
 uf.title_short = "Reading relaxation data from file."
 uf.add_keyarg(
     name = "ri_id",
@@ -271,9 +271,9 @@
     name = "ri_type",
     py_type = "str",
     desc_short = "relaxation type",
-    desc = "The relaxation data type, i.e. 'R1', 'R2', or 'NOE'.",
+    desc = "The relaxation data type, i.e. 'R1', 'R2', 'NOE', or 'R2eff'.",
     wiz_element_type = "combo",
-    wiz_combo_choices = ["R1", "R2", "NOE"],
+    wiz_combo_choices = ["R1", "R2", "NOE", "R2eff"],
     wiz_read_only = True
 )
 uf.add_keyarg(