r7102 - /1.3/specific_fns/base_class.py -- August 08, 2008 - 06:12

Author: bugman
Date: Thu Aug  7 23:34:36 2008
New Revision: 7102

URL: http://svn.gna.org/viewcvs/relax?rev=7102&view=rev
Log:
Updated the return_error() to accept the spin_id arg.


Modified:
    1.3/specific_fns/base_class.py

Modified: 1.3/specific_fns/base_class.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/base_class.py?rev=7102&r1=7101&r2=7102&view=diff
==============================================================================
--- 1.3/specific_fns/base_class.py (original)
+++ 1.3/specific_fns/base_class.py Thu Aug  7 23:34:36 2008
@@ -25,7 +25,7 @@
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
-from generic_fns.mol_res_spin import count_spins, exists_mol_res_spin_data, 
return_spin_from_index, spin_loop
+from generic_fns.mol_res_spin import count_spins, exists_mol_res_spin_data, 
return_spin, return_spin_from_index, spin_loop
 from relax_errors import RelaxError
 
 
@@ -150,15 +150,20 @@
         return spin.relax_data
 
 
-    def return_error(self, spin):
-        """Function for returning the Ri error structure for the given spin.
-
-        @param spin:    The SpinContainer object.
-        @type spin:     SpinContainer instance
+    def return_error(self, spin_id):
+        """Return the Ri error structure for the corresponding spin.
+
+        @param spin_id: The spin identification string, as yielded by the 
base_data_loop() generator
+                        method.
+        @type spin_id:  str
         @return:        The array of relaxation data error values.
         @rtype:         list of float
         """
 
+        # Get the spin container.
+        spin = return_spin(spin_id)
+
+        # Return the data.
         return spin.relax_error