r20660 - in /trunk/lib/spectrum: nmrpipe.py nmrview.py peak_list.py sparky.py xeasy.py -- August 21, 2013 - 14:24

Author: bugman
Date: Wed Aug 21 14:24:38 2013
New Revision: 20660

URL: http://svn.gna.org/viewcvs/relax?rev=20660&view=rev
Log:
Renamed all of read_*() functions of the lib.spectrum modules for consistency.

These functions will now be used to read all types of data from a peak list, 
from the assignments
to chemical shifts to peak intensites, and everything in between.


Modified:
    trunk/lib/spectrum/nmrpipe.py
    trunk/lib/spectrum/nmrview.py
    trunk/lib/spectrum/peak_list.py
    trunk/lib/spectrum/sparky.py
    trunk/lib/spectrum/xeasy.py

Modified: trunk/lib/spectrum/nmrpipe.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/nmrpipe.py?rev=20660&r1=20659&r2=20660&view=diff
==============================================================================
--- trunk/lib/spectrum/nmrpipe.py (original)
+++ trunk/lib/spectrum/nmrpipe.py Wed Aug 21 14:24:38 2013
@@ -31,7 +31,7 @@
 from lib.io import open_write_file, strip
 
 
-def read_list_intensity_seriestab(peak_list=None, file_data=None, 
int_col=None):
+def read_seriestab(peak_list=None, file_data=None, int_col=None):
     """Extract the intensity information from the NMRPipe SeriesTab peak 
intensity file.
 
     @keyword peak_list: The peak list object to place all data into.

Modified: trunk/lib/spectrum/nmrview.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/nmrview.py?rev=20660&r1=20659&r2=20660&view=diff
==============================================================================
--- trunk/lib/spectrum/nmrview.py (original)
+++ trunk/lib/spectrum/nmrview.py Wed Aug 21 14:24:38 2013
@@ -33,7 +33,7 @@
 from lib.warnings import RelaxWarning
 
 
-def read_list_intensity(peak_list=None, file_data=None, int_col=None):
+def read_list(peak_list=None, file_data=None, int_col=None):
     """Extract the peak intensity information from the NMRView peak 
intensity file.
 
     @keyword peak_list: The peak list object to place all data into.

Modified: trunk/lib/spectrum/peak_list.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/peak_list.py?rev=20660&r1=20659&r2=20660&view=diff
==============================================================================
--- trunk/lib/spectrum/peak_list.py (original)
+++ trunk/lib/spectrum/peak_list.py Wed Aug 21 14:24:38 2013
@@ -180,7 +180,7 @@
         print("NMRView formatted data file.\n")
 
         # Extract the data.
-        nmrview.read_list_intensity(peak_list=peak_list, file_data=file_data)
+        nmrview.read_list(peak_list=peak_list, file_data=file_data)
 
     # NMRPipe SeriesTab.
     elif format == 'seriestab':
@@ -188,7 +188,7 @@
         print("NMRPipe SeriesTab formatted data file.\n")
 
         # Extract the data.
-        nmrpipe.read_list_intensity_seriestab(peak_list=peak_list, 
file_data=file_data, int_col=int_col)
+        nmrpipe.read_seriestab(peak_list=peak_list, file_data=file_data, 
int_col=int_col)
 
     # Sparky.
     elif format == 'sparky':
@@ -196,7 +196,7 @@
         print("Sparky formatted data file.\n")
 
         # Extract the data.
-        sparky.read_list_intensity(peak_list=peak_list, file_data=file_data, 
int_col=int_col)
+        sparky.read_list(peak_list=peak_list, file_data=file_data, 
int_col=int_col)
 
     # XEasy.
     elif format == 'xeasy':
@@ -204,7 +204,7 @@
         print("XEasy formatted data file.\n")
 
         # Extract the data.
-        xeasy.read_list_intensity(peak_list=peak_list, file_data=file_data, 
int_col=int_col)
+        xeasy.read_list(peak_list=peak_list, file_data=file_data, 
int_col=int_col)
 
     # Return the peak list object.
     return peak_list

Modified: trunk/lib/spectrum/sparky.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/sparky.py?rev=20660&r1=20659&r2=20660&view=diff
==============================================================================
--- trunk/lib/spectrum/sparky.py (original)
+++ trunk/lib/spectrum/sparky.py Wed Aug 21 14:24:38 2013
@@ -32,7 +32,7 @@
 from lib.io import open_write_file, strip
 
 
-def read_list_intensity(peak_list=None, file_data=None, int_col=3):
+def read_list(peak_list=None, file_data=None, int_col=3):
     """Extract the peak intensity information from the Sparky peak intensity 
file.
 
     @keyword peak_list: The peak list object to place all data into.

Modified: trunk/lib/spectrum/xeasy.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/spectrum/xeasy.py?rev=20660&r1=20659&r2=20660&view=diff
==============================================================================
--- trunk/lib/spectrum/xeasy.py (original)
+++ trunk/lib/spectrum/xeasy.py Wed Aug 21 14:24:38 2013
@@ -29,7 +29,7 @@
 from lib.io import strip
 
 
-def read_list_intensity(peak_list=None, file_data=None, int_col=None):
+def read_list(peak_list=None, file_data=None, int_col=None):
     """Extract the peak intensity information from the XEasy file.
 
     @keyword peak_list: The peak list object to place all data into.