r18815 - in /branches/frame_order_testing: ./ relax_io.py -- March 13, 2013 - 15:32

Author: bugman
Date: Wed Mar 13 15:32:40 2013
New Revision: 18815

URL: http://svn.gna.org/viewcvs/relax?rev=18815&view=rev
Log:
Merged revisions 18814 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18814 | bugman | 2013-03-13 15:32:03 +0100 (Wed, 13 Mar 2013) | 11 lines
  
  Fix for the value.write user function for very small parameter values (Rex 
for example).
  
  This was reported by Martin Ballaschk <ballaschk att fmp-berlin dott de> in 
the thread
  http://thread.gmane.org/gmane.science.nmr.relax.user/1397/focus=1402 and by 
by Angelo Miguel
  Figueiredo <am dott figueiredo att fct dot unl dot pt> in the unrelated bug 
report at
  https://gna.org/bugs/?20613.
  
  The formatting string "20.15f" has been changed to "20.15g" to allow Python 
to decide if the normal
  decimal or exponential form of the number should be printed.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/relax_io.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 13 15:32:40 2013
@@ -1,1 +1,1 @@
-/trunk:1-18812
+/trunk:1-18814

Modified: branches/frame_order_testing/relax_io.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax_io.py?rev=18815&r1=18814&r2=18815&view=diff
==============================================================================
--- branches/frame_order_testing/relax_io.py (original)
+++ branches/frame_order_testing/relax_io.py Wed Mar 13 15:32:40 2013
@@ -827,15 +827,13 @@
             out.write('\n')
 
 
-def write_spin_data(file, dir=None, sep=None, spin_ids=None, mol_names=None, 
res_nums=None, res_names=None, spin_nums=None, spin_names=None, force=False, 
data=None, data_name=None, error=None, error_name=None, 
float_format="%20.15f"):
+def write_spin_data(file, dir=None, sep=None, spin_ids=None, mol_names=None, 
res_nums=None, res_names=None, spin_nums=None, spin_names=None, force=False, 
data=None, data_name=None, error=None, error_name=None, 
float_format="%20.15g"):
     """Generator function for reading the spin specific data from file.
 
     Description
     ===========
 
-    This function writes a columnar formatted file where each line 
corresponds to a spin system.
-    Spin identification is either through a spin ID string or through 
columns containing the
-    molecule name, residue name and number, and/or spin name and number.
+    This function writes a columnar formatted file where each line 
corresponds to a spin system.  Spin identification is either through a spin 
ID string or through columns containing the molecule name, residue name and 
number, and/or spin name and number.
 
 
     @param file:            The name of the file to write the data to (or 
alternatively an already opened file object).