r7563 - in /1.3: generic_fns/intensity.py specific_fns/noe.py -- October 07, 2008 - 22:57

Author: bugman
Date: Tue Oct  7 22:57:05 2008
New Revision: 7563

URL: http://svn.gna.org/viewcvs/relax?rev=7563&view=rev
Log:
The spectrum_type arg is now propagated all the way to where it's needed.


Modified:
    1.3/generic_fns/intensity.py
    1.3/specific_fns/noe.py

Modified: 1.3/generic_fns/intensity.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/intensity.py?rev=7563&r1=7562&r2=7563&view=diff
==============================================================================
--- 1.3/generic_fns/intensity.py (original)
+++ 1.3/generic_fns/intensity.py Tue Oct  7 22:57:05 2008
@@ -206,7 +206,7 @@
     return header_lines
 
 
-def read(file=None, dir=None, format=None, heteronuc=None, proton=None, 
int_col=None, assign_func=None):
+def read(file=None, dir=None, format=None, heteronuc=None, proton=None, 
int_col=None, assign_func=None, spectrum_type=None):
     """Read the peak intensity data.
 
     @keyword file:          The name of the file containing the peak 
intensities.
@@ -226,6 +226,8 @@
     @type int_col:          int
     @keyword assign_func:   A function used to place the intensity data 
within the spin container.
     @type assign_func:      func
+    @keyword spectrum_type: The optional spectrum type to be sent back into 
assign_func().
+    @type spectrum_type:    str
     """
 
     # Format argument.
@@ -298,4 +300,4 @@
             continue
 
         # Assign the data.
-        assign_func(spin=spin, intensity=intensity)
+        assign_func(spin=spin, intensity=intensity, 
spectrum_type=spectrum_type)

Modified: 1.3/specific_fns/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/noe.py?rev=7563&r1=7562&r2=7563&view=diff
==============================================================================
--- 1.3/specific_fns/noe.py (original)
+++ 1.3/specific_fns/noe.py Tue Oct  7 22:57:05 2008
@@ -138,7 +138,7 @@
             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)
+        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 read_columnar_results(self, run, file_data):