r17010 - in /branches/interatomic: ./ generic_fns/mol_res_spin.py -- June 21, 2012 - 10:10

Author: bugman
Date: Thu Jun 21 10:10:03 2012
New Revision: 17010

URL: http://svn.gna.org/viewcvs/relax?rev=17010&view=rev
Log:
Merged revisions 17009 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r17009 | bugman | 2012-06-21 10:01:59 +0200 (Thu, 21 Jun 2012) | 6 lines
  
  Bug fox for the generic_fns.mol_res_spin.return_spin_indices() function.
  
  The selection object was using the wrong variable name, and the look up 
table fallback was always
  on!
........

Modified:
    branches/interatomic/   (props changed)
    branches/interatomic/generic_fns/mol_res_spin.py

Propchange: branches/interatomic/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 21 10:10:03 2012
@@ -1,1 +1,1 @@
-/trunk:1-16998
+/trunk:1-17009

Modified: branches/interatomic/generic_fns/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/generic_fns/mol_res_spin.py?rev=17010&r1=17009&r2=17010&view=diff
==============================================================================
--- branches/interatomic/generic_fns/mol_res_spin.py (original)
+++ branches/interatomic/generic_fns/mol_res_spin.py Thu Jun 21 10:10:03 2012
@@ -2551,7 +2551,7 @@
     # No spin ID, so switch to selection matching.
     if not dp.mol.lookup_table.has_key(spin_id):
         # Parse the selection string.
-        select_obj = Selection(selection)
+        select_obj = Selection(spin_id)
 
         # Loop over the molecules.
         for i in range(len(dp.mol)):
@@ -2584,7 +2584,8 @@
                     break
 
     # The indices from the look up table.
-    mol_index, res_index, spin_index = dp.mol.lookup_table[spin_id]
+    else:
+        mol_index, res_index, spin_index = dp.mol.lookup_table[spin_id]
 
     # Return the data.
     return mol_index, res_index, spin_index