r20608 - /branches/peak_intensities/test_suite/system_tests/peak_lists.py -- August 16, 2013 - 18:48

Author: bugman
Date: Fri Aug 16 18:48:15 2013
New Revision: 20608

URL: http://svn.gna.org/viewcvs/relax?rev=20608&view=rev
Log:
Fix for many of the Peak_list system tests for the user function argument 
changes.

The heteronuc and proton arguments have been replaced by the dim argument.


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

Modified: branches/peak_intensities/test_suite/system_tests/peak_lists.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_intensities/test_suite/system_tests/peak_lists.py?rev=20608&r1=20607&r2=20608&view=diff
==============================================================================
--- branches/peak_intensities/test_suite/system_tests/peak_lists.py (original)
+++ branches/peak_intensities/test_suite/system_tests/peak_lists.py Fri Aug 
16 18:48:15 2013
@@ -78,7 +78,7 @@
         self.interpreter.sequence.read(file='test.seq', dir=path, 
spin_id_col=None, mol_name_col=1, res_num_col=2, res_name_col=3, 
spin_num_col=4, spin_name_col=5, sep=None, spin_id=None)
 
         # Load the intensities.
-        self.interpreter.spectrum.read_intensities(file='test.seq', 
dir=path, spectrum_id=['2', '0'], heteronuc='N', proton='HN', 
int_method='height', int_col=[6, 7], spin_id_col=None, mol_name_col=1, 
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, sep=None, 
spin_id=None, ncproc=None)
+        self.interpreter.spectrum.read_intensities(file='test.seq', 
dir=path, spectrum_id=['2', '0'], dim=1, int_method='height', int_col=[6, 7], 
spin_id_col=None, mol_name_col=1, res_num_col=2, res_name_col=3, 
spin_num_col=4, spin_name_col=5, sep=None, spin_id=None, ncproc=None)
 
         # The peak intensities.
         data_2 = [337765.90000000002, 1697771.0, 867389.80000000005, 
2339480.0, 2574062.0, 1609356.0, 2179341.0, 1563795.0, 1535896.0, 3578841.0]
@@ -213,10 +213,7 @@
         self.interpreter.residue.create(res_num = 6)
         self.interpreter.spin.name(name='N', spin_id=':6')
 
-        # Read the peak list for W62NE1-W62HE1, with heteronuc=NE1 and 
proton=HE1.
-        self.interpreter.spectrum.read_intensities(file="seriesTab.ser", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
heteronuc='NE1', proton='HE1', int_method='point sum')
-
-        # Read the peak list for heteronuc=N and proton=H.
+        # Read the peak list.
         self.interpreter.spectrum.read_intensities(file="seriesTab.ser", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
int_method='point sum')
 
         # Test the data.
@@ -240,7 +237,7 @@
         self.interpreter.residue.create(res_num = 6)
         self.interpreter.spin.name(name='N', spin_id=':6')
 
-        # Read the peak list for heteronuc=N and proton=H.
+        # Read the peak list.
         
self.interpreter.spectrum.read_intensities(file="seriesTab_multi.ser", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='auto', 
int_method='point sum')
 
         # Test the data.
@@ -376,7 +373,7 @@
         self.interpreter.spin.name(name='NE1')
 
         # Read the peak list.
-        
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
heteronuc='NE1', proton='HE1', int_method='height')
+        
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
int_method='height')
 
         # Test the data.
         
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0], 
1.532e+04)
@@ -390,7 +387,7 @@
         self.interpreter.spin.name(name='C')
 
         # Read the peak list.
-        
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
heteronuc='C', int_method='height')
+        
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
int_method='height')
 
         # Test the data.
         
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0], 
6.877e+03)
@@ -404,7 +401,7 @@
         self.interpreter.spin.name(name='C')
 
         # Read the peak list.
-        
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
heteronuc='C', proton='HE1', int_method='height')
+        
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
int_method='height')
 
         # Test the data.
         
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0], 
7.123e+03)