r20095 - in /branches/relax_disp: ./ pipe_control/rdc.py -- June 13, 2013 - 16:41

Author: bugman
Date: Thu Jun 13 16:41:52 2013
New Revision: 20095

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

........
  r20093 | bugman | 2013-06-13 15:25:46 +0200 (Thu, 13 Jun 2013) | 6 lines
  
  Polish for the rdc.read user function.
  
  Comment lines and blank lines are now removed to suppress useless warning 
messages about these lines
  containing no valid data.
........

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

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 13 16:41:52 2013
@@ -1,1 +1,1 @@
-/trunk:1-20091
+/trunk:1-20094

Modified: branches/relax_disp/pipe_control/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/rdc.py?rev=20095&r1=20094&r2=20095&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/rdc.py (original)
+++ branches/relax_disp/pipe_control/rdc.py Thu Jun 13 16:41:52 2013
@@ -40,7 +40,7 @@
 from lib.alignment.rdc import ave_rdc_tensor
 from lib.physical_constants import dipolar_constant, 
return_gyromagnetic_ratio
 from lib.errors import RelaxError, RelaxNoAlignError, RelaxNoRDCError, 
RelaxNoSequenceError, RelaxSpinTypeError
-from lib.io import extract_data, open_write_file, write_data
+from lib.io import extract_data, open_write_file, strip, write_data
 from lib.warnings import RelaxWarning
 
 
@@ -586,8 +586,9 @@
     # Spin specific data.
     #####################
 
-    # Extract the data from the file.
+    # Extract the data from the file, and remove comments and blank lines.
     file_data = extract_data(file, dir, sep=sep)
+    file_data = strip(file_data)
 
     # Loop over the RDC data.
     data = []