r11085 - /1.3/specific_fns/model_free/main.py -- April 14, 2010 - 09:22

Author: bugman
Date: Wed Apr 14 09:22:27 2010
New Revision: 11085

URL: http://svn.gna.org/viewcvs/relax?rev=11085&view=rev
Log:
Fix for bug #15874 (http://gna.org/bugs/?15874).

A truth condition was being asked of a numpy array.  This is not allowed.  It 
is now checked against
None!


Modified:
    1.3/specific_fns/model_free/main.py

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=11085&r1=11084&r2=11085&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Wed Apr 14 09:22:27 2010
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2003-2009 Edward d'Auvergne                                  
 #
+# Copyright (C) 2003-2010 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -449,7 +449,7 @@
         spin, spin_id = return_spin_from_index(global_index=spin_index, 
return_spin_id=True)
 
         # Missing structural data.
-        if hasattr(cdp, 'diff_tensor') and (cdp.diff_tensor.type == 
'spheroid' or cdp.diff_tensor.type == 'ellipsoid') and (not hasattr(spin, 
'xh_vect') or not spin.xh_vect):
+        if hasattr(cdp, 'diff_tensor') and (cdp.diff_tensor.type == 
'spheroid' or cdp.diff_tensor.type == 'ellipsoid') and (not hasattr(spin, 
'xh_vect') or spin.xh_vect == None):
             warn(RelaxDeselectWarning(spin_id, 'missing structural data'))
             return