r18757 - in /branches/frame_order_testing: ./ generic_fns/mol_res_spin.py -- March 11, 2013 - 12:27

Author: bugman
Date: Mon Mar 11 12:27:50 2013
New Revision: 18757

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

........
  r18756 | bugman | 2013-03-11 12:16:59 +0100 (Mon, 11 Mar 2013) | 6 lines
  
  The generic_fns.mol_res_spin.generate_spin_id_unique() function now handles 
missing spin containers.
  
  Previously if this function was used to generate a spin ID string of a spin 
not in the data store,
  it would fail.  Now it generates an ID by defaulting to generate_spin_id().
........

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

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 11 12:27:50 2013
@@ -1,1 +1,1 @@
-/trunk:1-18754
+/trunk:1-18756

Modified: branches/frame_order_testing/generic_fns/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/mol_res_spin.py?rev=18757&r1=18756&r2=18757&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/mol_res_spin.py (original)
+++ branches/frame_order_testing/generic_fns/mol_res_spin.py Mon Mar 11 
12:27:50 2013
@@ -1765,12 +1765,12 @@
     # Get the containers if needed.
     if mol == None:
         mol = return_molecule_by_name(pipe_cont=pipe_cont, mol_name=mol_name)
-    if res == None:
+    if mol != None and res == None:
         if res_name != None or res_num != None:
             res = return_residue_by_info(mol=mol, res_name=res_name, 
res_num=res_num)
         elif len(mol.res) == 1:
             res = mol.res[0]
-    if spin == None:
+    if res != None and spin == None:
         if spin_name != None or spin_num != None:
             spin = return_spin_by_info(res=res, spin_name=spin_name, 
spin_num=spin_num)
         elif len(res.spin) == 1: