r11086 - in /branches/bieri_gui: ./ specific_fns/model_free/main.py -- April 15, 2010 - 04:15

Author: michaelbieri
Date: Thu Apr 15 04:15:48 2010
New Revision: 11086

URL: http://svn.gna.org/viewcvs/relax?rev=11086&view=rev
Log:
Merged revisions 11085 via svnmerge from 
svn+ssh://michaelbieri@xxxxxxxxxxx/svn/relax/1.3

........
  r11085 | bugman | 2010-04-14 17:22:27 +1000 (Wed, 14 Apr 2010) | 6 lines
  
  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:
    branches/bieri_gui/   (props changed)
    branches/bieri_gui/specific_fns/model_free/main.py

Propchange: branches/bieri_gui/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 15 04:15:48 2010
@@ -1,1 +1,1 @@
-/1.3:1-11071
+/1.3:1-11085

Modified: branches/bieri_gui/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/model_free/main.py?rev=11086&r1=11085&r2=11086&view=diff
==============================================================================
--- branches/bieri_gui/specific_fns/model_free/main.py (original)
+++ branches/bieri_gui/specific_fns/model_free/main.py Thu Apr 15 04:15:48 
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