r18081 - /trunk/generic_fns/rdc.py -- December 07, 2012 - 18:22

Author: bugman
Date: Fri Dec  7 18:22:45 2012
New Revision: 18081

URL: http://svn.gna.org/viewcvs/relax?rev=18081&view=rev
Log:
Better printouts from the rdc.read user function - the numbers are now 
formatted.


Modified:
    trunk/generic_fns/rdc.py

Modified: trunk/generic_fns/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/rdc.py?rev=18081&r1=18080&r2=18081&view=diff
==============================================================================
--- trunk/generic_fns/rdc.py (original)
+++ trunk/generic_fns/rdc.py Fri Dec  7 18:22:45 2012
@@ -31,7 +31,7 @@
 from warnings import warn
 
 # relax module imports.
-from arg_check import is_float
+from check_types import is_float
 from float import nan
 from generic_fns import grace, pipes
 from generic_fns.align_tensor import get_tensor_index
@@ -94,7 +94,7 @@
             raise RelaxSpinTypeError(interatom.spin_id2)
 
         # Single vector.
-        if is_float(interatom.vector[0], raise_error=False):
+        if is_float(interatom.vector[0]):
             vectors = [interatom.vector]
         else:
             vectors = interatom.vector
@@ -674,7 +674,15 @@
             interatom.rdc_err[align_id] = error
 
         # Append the data for printout.
-        data.append([spin_id1, spin_id2, repr(value), repr(error)])
+        data.append([spin_id1, spin_id2])
+        if is_float(value):
+            data[-1].append("%20.15f" % value)
+        else:
+            data[-1].append("%20s" % value)
+        if is_float(error):
+            data[-1].append("%20.15f" % error)
+        else:
+            data[-1].append("%20s" % error)
 
     # No data, so fail hard!
     if not len(data):