r16915 - /trunk/generic_fns/mol_res_spin.py -- June 14, 2012 - 16:34

Author: bugman
Date: Thu Jun 14 16:34:52 2012
New Revision: 16915

URL: http://svn.gna.org/viewcvs/relax?rev=16915&view=rev
Log:
return_spin_from_id() now defaults to return_spin() when the spin ID is not 
in the lookup table.

The slower return_spin() method will allow return_spin_from_id() to always be 
functional.


Modified:
    trunk/generic_fns/mol_res_spin.py

Modified: trunk/generic_fns/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/mol_res_spin.py?rev=16915&r1=16914&r2=16915&view=diff
==============================================================================
--- trunk/generic_fns/mol_res_spin.py (original)
+++ trunk/generic_fns/mol_res_spin.py Thu Jun 14 16:34:52 2012
@@ -2452,9 +2452,9 @@
     # Get the data pipe.
     dp = pipes.get_pipe(pipe)
 
-    # No spin ID.
+    # No spin ID, so switch to selection matching.
     if not dp.mol.lookup_table.has_key(spin_id):
-        raise RelaxError("The spin ID '%s' cannot be found in the look up 
table." % spin_id)
+        return return_spin_from_selection(selection=spin_id, pipe=pipe, 
full_info=full_info)
 
     # The indices from the look up table.
     mol_index, res_index, spin_index = dp.mol.lookup_table[spin_id]