r17107 - /branches/interatomic/generic_fns/rdc.py -- June 28, 2012 - 18:34

Author: bugman
Date: Thu Jun 28 18:34:19 2012
New Revision: 17107

URL: http://svn.gna.org/viewcvs/relax?rev=17107&view=rev
Log:
Fix for the rdc.read user function - values and errors of None in the file 
are supported again.

This was broken with the interatomic data redesign.


Modified:
    branches/interatomic/generic_fns/rdc.py

Modified: branches/interatomic/generic_fns/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/interatomic/generic_fns/rdc.py?rev=17107&r1=17106&r2=17107&view=diff
==============================================================================
--- branches/interatomic/generic_fns/rdc.py (original)
+++ branches/interatomic/generic_fns/rdc.py Thu Jun 28 18:34:19 2012
@@ -488,6 +488,8 @@
             spin_id2 = eval(spin_id2)
 
         # Convert and check the value.
+        if value == 'None':
+            value = None
         if value != None:
             try:
                 value = float(value)
@@ -496,6 +498,8 @@
                 continue
 
         # Convert and check the error.
+        if error == 'None':
+            error = None
         if error != None:
             try:
                 error = float(error)