r7508 - /1.3/specific_fns/model_free/main.py -- October 05, 2008 - 12:40

Author: bugman
Date: Sun Oct  5 12:40:53 2008
New Revision: 7508

URL: http://svn.gna.org/viewcvs/relax?rev=7508&view=rev
Log:
Partial fix for bug #12407 (https://gna.org/bugs/index.php?12407).

This catches the "TypeError: unsupported operand type(s) for *: 'float' and 
'NoneType'" error.  If
the local or global tm is missing for some reason, the eliminate function 
returns False indicating 
that the model has not been eliminated.


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=7508&r1=7507&r2=7508&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Sun Oct  5 12:40:53 2008
@@ -1195,11 +1195,15 @@
         # Get the spin and it's id string.
         spin, spin_id = return_spin_from_index(model_index, 
return_spin_id=True)
 
-         # Get the tm value.
+        # Get the tm value.
         if model_type == 'local_tm':
             tm = spin.local_tm
         else:
             tm = cdp.diff_tensor.tm
+
+        # No tm value set, so skip the tests (no elimination).
+        if tm == None:
+            return False
 
         # Local tm.
         if name == 'local_tm' and value >= c1: