r7561 - /1.3/specific_fns/noe.py -- October 07, 2008 - 22:53

Author: bugman
Date: Tue Oct  7 22:52:59 2008
New Revision: 7561

URL: http://svn.gna.org/viewcvs/relax?rev=7561&view=rev
Log:
Converted the assign_function() method to the new design.


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=7561&r1=7560&r2=7561&view=diff
==============================================================================
--- 1.3/specific_fns/noe.py (original)
+++ 1.3/specific_fns/noe.py Tue Oct  7 22:52:59 2008
@@ -36,14 +36,24 @@
         """Class containing functions for relaxation data."""
 
 
-    def assign_function(self, run=None, i=None, intensity=None):
-        """Function for assigning peak intensity data to either the 
reference or saturated spectra."""
+    def assign_function(self, spin=None, intensity=None, spectrum_type=None):
+        """Place the peak intensity data into the spin container.
+
+        The intensity data can be either that of the reference or saturated 
spectrum.
+
+        @keyword spin:          The spin container.
+        @type spin:             SpinContainer instance
+        @keyword intensity:     The intensity value.
+        @type intensity:        float
+        @keyword spectrum_type: The type of spectrum, one of 'ref' or 'sat'.
+        @type spectrum_type:    str
+        """
 
         # Add the data.
-        if self.spectrum_type == 'ref':
-            ds.res[run][i].ref = intensity
-        elif self.spectrum_type == 'sat':
-            ds.res[run][i].sat = intensity
+        if spectrum_type == 'ref':
+            spin.ref = intensity
+        elif spectrum_type == 'sat':
+            spin.sat = intensity
 
 
     def calculate(self, run=None, verbosity=1):