r19915 - in /branches/relax_disp: ./ test_suite/system_tests/peak_lists.py -- June 06, 2013 - 20:16

Author: bugman
Date: Thu Jun  6 20:16:24 2013
New Revision: 19915

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

........
  r19914 | bugman | 2013-06-06 20:15:33 +0200 (Thu, 06 Jun 2013) | 5 lines
  
  Fix for the Peak_lists.test_bug_20873_peak_lists system test.
  
  The spectrum IDs are now strings.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/test_suite/system_tests/peak_lists.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun  6 20:16:24 2013
@@ -1,1 +1,1 @@
-/trunk:1-19912
+/trunk:1-19914

Modified: branches/relax_disp/test_suite/system_tests/peak_lists.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/peak_lists.py?rev=19915&r1=19914&r2=19915&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/peak_lists.py (original)
+++ branches/relax_disp/test_suite/system_tests/peak_lists.py Thu Jun  6 
20:16:24 2013
@@ -77,7 +77,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'], 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) 
 
 
     def test_ccpn_analysis(self):