r8049 - /branches/spectral_errors/test_suite/system_tests/peak_lists.py -- November 27, 2008 - 18:06

Author: bugman
Date: Thu Nov 27 18:06:29 2008
New Revision: 8049

URL: http://svn.gna.org/viewcvs/relax?rev=8049&view=rev
Log:
Fixes for all the peak list reading tests.

The int_method arg to spectrum.read_intensities() was incorrectly set to 
'heights'.


Modified:
    branches/spectral_errors/test_suite/system_tests/peak_lists.py

Modified: branches/spectral_errors/test_suite/system_tests/peak_lists.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/test_suite/system_tests/peak_lists.py?rev=8049&r1=8048&r2=8049&view=diff
==============================================================================
--- branches/spectral_errors/test_suite/system_tests/peak_lists.py (original)
+++ branches/spectral_errors/test_suite/system_tests/peak_lists.py Thu Nov 27 
18:06:29 2008
@@ -61,7 +61,7 @@
         self.relax.interpreter._Spin.name(name='N')
         
         # Read the peak list.
-        
self.relax.interpreter._Spectrum.read_intensities(file="generic.txt", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", spectrum_id='test', 
int_method='heights')
+        
self.relax.interpreter._Spectrum.read_intensities(file="generic.txt", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", spectrum_id='test', 
int_method='height')
 
         # Test the data.
         self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 1.0000)
@@ -79,7 +79,7 @@
         self.relax.interpreter._Spin.name(name='N')
 
         # Read the peak list.
-        self.relax.interpreter._Spectrum.read_intensities(file="cNTnC.xpk", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", spectrum_id='test', 
int_method='heights')
+        self.relax.interpreter._Spectrum.read_intensities(file="cNTnC.xpk", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", spectrum_id='test', 
int_method='height')
 
         # Test the data.
         self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], -0.1694)
@@ -100,7 +100,7 @@
         self.relax.interpreter._Spin.name(name='N')
 
         # Read the peak list.
-        
self.relax.interpreter._Spectrum.read_intensities(file="ref_ave.list", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", spectrum_id='test', 
int_method='heights')
+        
self.relax.interpreter._Spectrum.read_intensities(file="ref_ave.list", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", spectrum_id='test', 
int_method='height')
 
         # Test the data.
         self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 6262)
@@ -140,7 +140,7 @@
         self.relax.interpreter._Spin.name(name='N')
 
         # Read the peak list.
-        
self.relax.interpreter._Spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", spectrum_id='test', 
int_method='heights')
+        
self.relax.interpreter._Spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", spectrum_id='test', 
int_method='height')
 
         # Test the data.
         self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 9.714e+03)