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

Author: bugman
Date: Thu Jun  6 20:38:48 2013
New Revision: 19919

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

........
  r19918 | bugman | 2013-06-06 20:37:51 +0200 (Thu, 06 Jun 2013) | 3 lines
  
  Added checks of the peak intensities to the 
Peak_lists.test_bug_20873_peak_lists system test.
........

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:38:48 2013
@@ -1,1 +1,1 @@
-/trunk:1-19916
+/trunk:1-19918

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=19919&r1=19918&r2=19919&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:38:48 2013
@@ -78,6 +78,20 @@
 
         # 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) 
+
+        # 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]
+        data_0 = [636244.59999999998, 3015788.0, 1726064.0, 4039142.0, 
4313824.0, 2927111.0, 4067343.0, 2921316.0, 3005234.0, 6352595.0]
+
+        # Data checks.
+        for i in range(len(cdp.mol[0].res)):
+            # Alias the spin.
+            spin = cdp.mol[0].res[i].spin[0]
+
+            # The intensities.
+            print spin
+            self.assertEqual(spin.intensities['0'], data_0[i])
+            self.assertEqual(spin.intensities['2'], data_2[i])
 
 
     def test_ccpn_analysis(self):