r20618 - in /branches/peak_intensities/test_suite/system_tests/scripts: 1UBQ_relax_fit.py noe.py -- August 16, 2013 - 19:56

Author: bugman
Date: Fri Aug 16 19:56:45 2013
New Revision: 20618

URL: http://svn.gna.org/viewcvs/relax?rev=20618&view=rev
Log:
Fixes for a few system tests for the spectrum.read_intensities user function 
argument changes.


Modified:
    
branches/peak_intensities/test_suite/system_tests/scripts/1UBQ_relax_fit.py
    branches/peak_intensities/test_suite/system_tests/scripts/noe.py

Modified: 
branches/peak_intensities/test_suite/system_tests/scripts/1UBQ_relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_intensities/test_suite/system_tests/scripts/1UBQ_relax_fit.py?rev=20618&r1=20617&r2=20618&view=diff
==============================================================================
--- 
branches/peak_intensities/test_suite/system_tests/scripts/1UBQ_relax_fit.py 
(original)
+++ 
branches/peak_intensities/test_suite/system_tests/scripts/1UBQ_relax_fit.py 
Fri Aug 16 19:56:45 2013
@@ -54,7 +54,7 @@
 # Loop over the spectra.
 for i in range(len(names)):
     # Load the peak intensities.
-    spectrum.read_intensities(file=names[i]+'.listb', dir=list_path, 
spectrum_id=names[i], int_method='height', proton='H')
+    spectrum.read_intensities(file=names[i]+'.listb', dir=list_path, 
spectrum_id=names[i], int_method='height')
 
     # Set the relaxation times.
     relax_fit.relax_time(time=times[i], spectrum_id=names[i])

Modified: branches/peak_intensities/test_suite/system_tests/scripts/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_intensities/test_suite/system_tests/scripts/noe.py?rev=20618&r1=20617&r2=20618&view=diff
==============================================================================
--- branches/peak_intensities/test_suite/system_tests/scripts/noe.py 
(original)
+++ branches/peak_intensities/test_suite/system_tests/scripts/noe.py Fri Aug 
16 19:56:45 2013
@@ -19,10 +19,8 @@
 spin.create(res_num=40, spin_name='NE1')
 
 # Load the reference spectrum and saturated spectrum peak intensities.
-spectrum.read_intensities(file='ref_ave.list', dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='ref_ave', 
heteronuc='N', proton='HN')
-spectrum.read_intensities(file='ref_ave.list', dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='ref_ave', 
heteronuc='NE1', proton='HE1')
-spectrum.read_intensities(file='sat_ave.list', dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='sat_ave', 
heteronuc='N', proton='HN')
-spectrum.read_intensities(file='sat_ave.list', dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='sat_ave', 
heteronuc='NE1', proton='HE1')
+spectrum.read_intensities(file='ref_ave.list', dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='ref_ave')
+spectrum.read_intensities(file='sat_ave.list', dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='sat_ave')
 
 # Set the spectrum types.
 noe.spectrum_type('ref', 'ref_ave')