r5895 - /1.3/generic_fns/angles.py -- April 21, 2008 - 00:47

Author: bugman
Date: Mon Apr 21 00:35:30 2008
New Revision: 5895

URL: http://svn.gna.org/viewcvs/relax?rev=5895&view=rev
Log:
Fixes for the angle_diff_frame() function.


Modified:
    1.3/generic_fns/angles.py

Modified: 1.3/generic_fns/angles.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/angles.py?rev=5895&r1=5894&r2=5895&view=diff
==============================================================================
--- 1.3/generic_fns/angles.py (original)
+++ 1.3/generic_fns/angles.py Mon Apr 21 00:35:30 2008
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2003-2005, 2007 Edward d'Auvergne                            
 #
+# Copyright (C) 2003-2005, 2007-2008 Edward d'Auvergne                       
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -26,6 +26,8 @@
 
 # relax module imports.
 from data import Data as relax_data_store
+from generic_fns import pipes
+from generic_fns.selection import exists_mol_res_spin_data
 from relax_errors import RelaxError, RelaxNoPdbError, RelaxNoSequenceError, 
RelaxNoTensorError
 
 
@@ -39,7 +41,7 @@
     cdp = relax_data_store[relax_data_store.current_pipe]
 
     # Test if the PDB file has been loaded.
-    if not hasattr(relax_data_store, 'structure'):
+    if not hasattr(cdp, 'structure'):
         raise RelaxNoPdbError
 
     # Test if sequence data is loaded.
@@ -47,7 +49,7 @@
         raise RelaxNoSequenceError
 
     # Test if the diffusion tensor data is loaded.
-    if not diff_data_exists():
+    if not hasattr(cdp, 'diff_tensor'):
         raise RelaxNoTensorError, 'diffusion'
 
     # Sphere.