r21262 - in /branches/relax_disp: ./ pipe_control/value.py -- October 27, 2013 - 19:11

Author: bugman
Date: Sun Oct 27 19:11:52 2013
New Revision: 21262

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

........
  r21261 | bugman | 2013-10-27 19:09:56 +0100 (Sun, 27 Oct 2013) | 6 lines
  
  The value.write user function can now properly handle non-numeric data 
types.
  
  This allows the spin specific model name to be written to file, or any 
other string defined in the
  specific analysis PARAMS data object.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/pipe_control/value.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Oct 27 19:11:52 2013
@@ -1,1 +1,1 @@
-/trunk:1-21257
+/trunk:1-21261

Modified: branches/relax_disp/pipe_control/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/value.py?rev=21262&r1=21261&r2=21262&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/value.py (original)
+++ branches/relax_disp/pipe_control/value.py Sun Oct 27 19:11:52 2013
@@ -27,6 +27,7 @@
 import sys
 
 # relax module imports.
+from lib.check_types import is_num
 from lib.errors import RelaxError, RelaxNoSequenceError, RelaxParamSetError, 
RelaxValueError
 from lib.io import get_file_path, open_write_file, read_spin_data, 
write_spin_data
 from pipe_control import minimise, pipes
@@ -662,9 +663,9 @@
     @type scaling:  float
     """
 
-    # None.
-    if value == None:
-        return None
+    # No a number, so return the value unmodified.
+    if not is_num(value):
+        return value
 
     # Scale.
     return value * scaling