r7796 - in /1.3: generic_fns/intensity.py prompt/noe.py prompt/relax_fit.py -- October 17, 2008 - 00:29

Author: semor
Date: Fri Oct 17 00:29:26 2008
New Revision: 7796

URL: http://svn.gna.org/viewcvs/relax?rev=7796&view=rev
Log:
Corrected some naming and syntax within docstrings and prints.

This follows a post by Edward at:
https://mail.gna.org/public/relax-devel/2008-10/msg00068.html
(message ID: 7f080ed10810161412j1910a956gd37dbd35eb0584c1@xxxxxxxxxxxxxx)


Modified:
    1.3/generic_fns/intensity.py
    1.3/prompt/noe.py
    1.3/prompt/relax_fit.py

Modified: 1.3/generic_fns/intensity.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/intensity.py?rev=7796&r1=7795&r2=7796&view=diff
==============================================================================
--- 1.3/generic_fns/intensity.py (original)
+++ 1.3/generic_fns/intensity.py Fri Oct 17 00:29:26 2008
@@ -177,8 +177,8 @@
     @param line:        The single line of information from the intensity 
file.
     @type line:         list of str
     @keyword int_col:   The column containing the peak intensity data. The 
default is 16 for
-                        intensities. 'int_col = 15' will use the volumes (or 
evolumes). For a
-                        non-standard formatted file, use a different value.
+                        intensities. Setting the int_col argument to 15 will 
use the volumes (or
+                        evolumes). For a non-standard formatted file, use a 
different value.
     @type int_col:      int
     @raises RelaxError: When the expected peak intensity is not a float.
     """
@@ -211,9 +211,9 @@
     if int_col == None:
         int_col = 16
     if int_col == 16:
-        print 'Using intensities.'
+        print 'Using peak heights.'
     if int_col == 15:
-        print 'Using volumes (or evolumes).'
+        print 'Using peak volumes (or evolumes).'
 
     # Intensity.
     try:

Modified: 1.3/prompt/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/noe.py?rev=7796&r1=7795&r2=7796&view=diff
==============================================================================
--- 1.3/prompt/noe.py (original)
+++ 1.3/prompt/noe.py Fri Oct 17 00:29:26 2008
@@ -145,8 +145,8 @@
         will be ignored.
 
         If the 'format' argument is set to 'nmrview', the file should be a 
NMRView peak list. The
-        default is to use column 16 (which contains peak intensities) for 
peak amplitudes. To use
-        use peak volumes (or evolumes), 'int_col = 15' must be used.
+        default is to use column 16 (which contains peak heights) for peak 
intensities. To use
+        use peak volumes (or evolumes), int_col must be set to 15.
 
 
         The 'heteronuc' and 'proton' arguments should be set respectively to 
the name of the

Modified: 1.3/prompt/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/relax_fit.py?rev=7796&r1=7795&r2=7796&view=diff
==============================================================================
--- 1.3/prompt/relax_fit.py (original)
+++ 1.3/prompt/relax_fit.py Fri Oct 17 00:29:26 2008
@@ -143,8 +143,8 @@
         will be ignored.
 
         If the 'format' argument is set to 'nmrview', the file should be a 
NMRView peak list. The
-        default is to use column 16 (which contains peak intensities) for 
peak amplitudes. To use
-        use peak volumes (or evolumes), 'int_col = 15' must be used.
+        default is to use column 16 (which contains peak heights) for peak 
intensities. To use
+        use peak volumes (or evolumes), int_col must be set to 15.
 
 
         The heteronuc and proton arguments should be set respectively to the 
name of the