r6222 - /1.3/specific_fns/relax_fit.py -- May 21, 2008 - 23:41

Author: bugman
Date: Wed May 21 23:41:06 2008
New Revision: 6222

URL: http://svn.gna.org/viewcvs/relax?rev=6222&view=rev
Log:
Updated the return_data() and return_error() methods to the new relax design.


Modified:
    1.3/specific_fns/relax_fit.py

Modified: 1.3/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=6222&r1=6221&r2=6222&view=diff
==============================================================================
--- 1.3/specific_fns/relax_fit.py (original)
+++ 1.3/specific_fns/relax_fit.py Wed May 21 23:41:06 2008
@@ -1013,16 +1013,28 @@
         intensity.read(file=file, dir=dir, format=format, 
heteronuc=heteronuc, proton=proton, int_col=int_col, 
assign_func=self.assign_function)
 
 
-    def return_data(self, run, i):
-        """Function for returning the peak intensity data structure."""
-
-        return relax_data_store.res[run][i].intensities
-
-
-    def return_error(self, run, i):
-        """Function for returning the standard deviation data structure."""
-
-        return relax_data_store.sd[run]
+    def return_data(self, spin):
+        """Function for returning the peak intensity data structure.
+
+        @param spin:    The spin container.
+        @type spin:     SpinContainer instance
+        @return:        The peak intensity data structure.
+        @rtype:         list of float
+        """
+
+        return spin.intensities
+
+
+    def return_error(self, spin):
+        """Return the standard deviation data structure.
+
+        @param spin:    The spin container.
+        @type spin:     SpinContainer instance
+        @return:        The standard deviation data structure.
+        @rtype:         list of float
+        """
+
+        return relax_data_store[relax_data_store].sd
 
 
     def return_data_name(self, name):