r9923 - /1.3/specific_fns/noe.py -- November 24, 2009 - 15:04

Author: bugman
Date: Tue Nov 24 15:04:25 2009
New Revision: 9923

URL: http://svn.gna.org/viewcvs/relax?rev=9923&view=rev
Log:
Removed the unused _read() method.

This has been superseded by the spectrum.read_intensities() user function.


Modified:
    1.3/specific_fns/noe.py

Modified: 1.3/specific_fns/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/noe.py?rev=9923&r1=9922&r2=9923&view=diff
==============================================================================
--- 1.3/specific_fns/noe.py (original)
+++ 1.3/specific_fns/noe.py Tue Nov 24 15:04:25 2009
@@ -56,42 +56,6 @@
             spin.sat = intensity
         else:
             raise RelaxError("The spectrum type '%s' is unknown." % 
spectrum_type)
-
-
-    def _read(self, file=None, dir=None, spectrum_type=None, format=None, 
heteronuc=None, proton=None, int_col=None):
-        """Read in the peak intensity data.
-
-        @keyword file:          The name of the file containing the peak 
intensities.
-        @type file:             str
-        @keyword dir:           The directory where the file is located.
-        @type dir:              str
-        @keyword spectrum_type: The type of spectrum, one of 'ref' or 'sat'.
-        @type spectrum_type:    str
-        @keyword format:        The type of file containing peak 
intensities.  This can currently be
-                                one of 'sparky', 'xeasy' or 'nmrview'.
-        @type format:           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 int_col:       The column containing the peak intensity 
data (for a non-standard
-                                formatted file).
-        @type int_col:          int
-        """
-
-        asdf
-        # Spectrum type argument.
-        spect_type_list = ['ref', 'sat']
-        if spectrum_type not in spect_type_list:
-            raise RelaxArgNotInListError('spectrum type', spectrum_type, 
spect_type_list)
-        if spectrum_type == 'ref':
-            print("Reference spectrum.")
-        if spectrum_type == 'sat':
-            print("Saturated spectrum.")
-
-        # Generic intensity function.
-        intensity.read(file=file, dir=dir, format=format, 
heteronuc=heteronuc, proton=proton, int_col=int_col, 
assign_func=self._assign_function, spectrum_type=spectrum_type)
 
 
     def _spectrum_type(self, spectrum_type=None, spectrum_id=None):