r26494 - in /branches/space_mapping_refactor: ./ test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py -- November 10, 2014 - 18:38

Author: bugman
Date: Mon Nov 10 18:38:00 2014
New Revision: 26494

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

........
  r26486 | bugman | 2014-11-10 18:19:49 +0100 (Mon, 10 Nov 2014) | 7 lines
  
  Fix for bug #22937 (https://gna.org/bugs/?22937).
  
  This is the failure of the Relax_disp.test_estimate_r2eff_err_auto system 
test on Python 2.5.  The
  
test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py 
simply required a
  newline character at the end of the file so that it can be executed in 
Python 2.5.
........

Modified:
    branches/space_mapping_refactor/   (props changed)
    
branches/space_mapping_refactor/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py

Propchange: branches/space_mapping_refactor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 10 18:38:00 2014
@@ -1 +1 @@
-/trunk:1-26385,26395,26482-26485
+/trunk:1-26492

Modified: 
branches/space_mapping_refactor/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/space_mapping_refactor/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py?rev=26494&r1=26493&r2=26494&view=diff
==============================================================================
--- 
branches/space_mapping_refactor/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py
        (original)
+++ 
branches/space_mapping_refactor/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py
        Mon Nov 10 18:38:00 2014
@@ -104,4 +104,4 @@
 
 
 # Read the R1 data
-# relax_data.read(ri_id='R1', ri_type='R1', 
frq=cdp.spectrometer_frq_list[0], file='R1_fitted_values.txt', dir=data_path, 
mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, 
spin_name_col=5, data_col=6, error_col=7)
+# relax_data.read(ri_id='R1', ri_type='R1', 
frq=cdp.spectrometer_frq_list[0], file='R1_fitted_values.txt', dir=data_path, 
mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, 
spin_name_col=5, data_col=6, error_col=7)