r7960 - /branches/spectral_errors/test_suite/system_tests/peak_lists.py -- October 23, 2008 - 18:57

Author: bugman
Date: Thu Oct 23 18:57:53 2008
New Revision: 7960

URL: http://svn.gna.org/viewcvs/relax?rev=7960&view=rev
Log:
Fixes for the peak list system tests, using the new 
spectrum.read_intensities() user function.


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=7960&r1=7959&r2=7960&view=diff
==============================================================================
--- branches/spectral_errors/test_suite/system_tests/peak_lists.py (original)
+++ branches/spectral_errors/test_suite/system_tests/peak_lists.py Thu Oct 23 
18:57:53 2008
@@ -61,7 +61,7 @@
         self.relax.interpreter._Spin.name(name='N')
         
         # Read the peak list.
-        self.relax.interpreter._Relax_fit.read(file="generic.txt", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", format='generic')
+        
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')
 
         # Test the data.
         self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0][0], 1.0000)
@@ -79,7 +79,7 @@
         self.relax.interpreter._Spin.name(name='N')
 
         # Read the peak list.
-        self.relax.interpreter._Relax_fit.read(file="cNTnC.xpk", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", relax_time=0.0176, 
format='nmrview')
+        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')
 
         # Test the data.
         self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0][0], 
-0.1694)
@@ -100,7 +100,7 @@
         self.relax.interpreter._Spin.name(name='N')
 
         # Read the peak list.
-        self.relax.interpreter._Relax_fit.read(file="ref_ave.list", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", relax_time=0.0, 
format='sparky')
+        
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')
 
         # Test the data.
         self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0][0], 6262)
@@ -140,7 +140,7 @@
         self.relax.interpreter._Spin.name(name='N')
 
         # Read the peak list.
-        self.relax.interpreter._Relax_fit.read(file="xeasy_r1_20ms.text", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", relax_time=0.020, 
format='xeasy')
+        
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')
 
         # Test the data.
         self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0][0], 
9.714e+03)