r16993 - in /branches/interatomic: ./ generic_fns/relax_data.py -- June 20, 2012 - 01:34

Author: bugman
Date: Wed Jun 20 01:34:16 2012
New Revision: 16993

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

........
  r16992 | bugman | 2012-06-20 01:33:02 +0200 (Wed, 20 Jun 2012) | 3 lines
  
  Bug fix for the relax_data.copy user function - it can now handle spins 
without relaxation data.
........

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

Propchange: branches/interatomic/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 20 01:34:16 2012
@@ -1,1 +1,1 @@
-/trunk:1-16959
+/trunk:1-16992

Modified: branches/interatomic/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/generic_fns/relax_data.py?rev=16993&r1=16992&r2=16993&view=diff
==============================================================================
--- branches/interatomic/generic_fns/relax_data.py (original)
+++ branches/interatomic/generic_fns/relax_data.py Wed Jun 20 01:34:16 2012
@@ -447,6 +447,10 @@
             # Alias the spin containers.
             spin_from = 
dp_from.mol[mol_index].res[res_index].spin[spin_index]
             spin_to = dp_to.mol[mol_index].res[res_index].spin[spin_index]
+
+            # No data or errors.
+            if not hasattr(spin_from, 'ri_data') and not hasattr(spin_from, 
'ri_data_err'):
+                continue
 
             # Initialise the spin data if necessary.
             if not hasattr(spin_to, 'ri_data'):