r20598 - /branches/peak_intensities/pipe_control/spectrum.py -- August 15, 2013 - 12:01

Author: bugman
Date: Thu Aug 15 12:01:52 2013
New Revision: 20598

URL: http://svn.gna.org/viewcvs/relax?rev=20598&view=rev
Log:
Replaced the 'heteronuc' and 'proton' arguments of the 
spectrum.read_intensities user function backend with 'dim'.


Modified:
    branches/peak_intensities/pipe_control/spectrum.py

Modified: branches/peak_intensities/pipe_control/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_intensities/pipe_control/spectrum.py?rev=20598&r1=20597&r2=20598&view=diff
==============================================================================
--- branches/peak_intensities/pipe_control/spectrum.py (original)
+++ branches/peak_intensities/pipe_control/spectrum.py Thu Aug 15 12:01:52 
2013
@@ -452,7 +452,7 @@
     raise RelaxImplementError
 
 
-def read(file=None, dir=None, spectrum_id=None, heteronuc=None, proton=None, 
int_col=None, int_method=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, 
sep=None, spin_id=None, ncproc=None, verbose=True):
+def read(file=None, dir=None, spectrum_id=None, dim=1, int_col=None, 
int_method=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, sep=None, 
spin_id=None, ncproc=None, verbose=True):
     """Read the peak intensity data.
 
     @keyword file:          The name of the file containing the peak 
intensities.
@@ -461,10 +461,8 @@
     @type dir:              str
     @keyword spectrum_id:   The spectrum identification string.
     @type spectrum_id:      str or list of str
-    @keyword heteronuc:     The name of the heteronucleus as specified in 
the peak intensity file.
-    @type heteronuc:        str
-    @keyword proton:        The name of the proton as specified in the peak 
intensity file.
-    @type proton:           str
+    @keyword dim:           The dimension of the peak list to associate the 
data with.
+    @type dim:              int
     @keyword int_col:       The column containing the peak intensity data 
(used by the generic intensity file format).
     @type int_col:          int
     @keyword int_method:    The integration method, one of 'height', 'point 
sum' or 'other'.