r20250 - /trunk/test_suite/system_tests/peak_lists.py -- June 21, 2013 - 19:46

Author: bugman
Date: Fri Jun 21 19:46:58 2013
New Revision: 20250

URL: http://svn.gna.org/viewcvs/relax?rev=20250&view=rev
Log:
Fix for commit (http://article.gmane.org/gmane.science.nmr.relax.scm/18004). 
The spin naming was wrong.

Progress sr #3043: (https://gna.org/support/index.php?3043) - Support for 
NMRPipe seriesTab format
*.ser.

The spin naming was wrong. 'spin_id' keywords should be supplied different. 
Ex:
spin.name(name='NE1', spin_id=':62').


Modified:
    trunk/test_suite/system_tests/peak_lists.py

Modified: trunk/test_suite/system_tests/peak_lists.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/peak_lists.py?rev=20250&r1=20249&r2=20250&view=diff
==============================================================================
--- trunk/test_suite/system_tests/peak_lists.py (original)
+++ trunk/test_suite/system_tests/peak_lists.py Fri Jun 21 19:46:58 2013
@@ -206,20 +206,20 @@
         """Test the reading of an NMRPipe seriesTab peak list."""
 
         # Create the sequence data, and name the spins.
-        self.interpreter.residue.create(62)
-        self.interpreter.spin.name(name='NE1')
-        self.interpreter.residue.create(10)
-        self.interpreter.residue.create(6)
-        self.interpreter.spin.name(name='N', spin_id=1)
-        self.interpreter.spin.name(name='N', spin_id=1)
+        self.interpreter.residue.create(res_num = 62, res_name=None, 
mol_name=None )
+        self.interpreter.spin.name(name='NE1', spin_id=':62')
+        self.interpreter.residue.create(res_num = 10)
+        self.interpreter.spin.name(name='N', spin_id=':10')
+        self.interpreter.residue.create(res_num = 6)
+        self.interpreter.spin.name(name='N', spin_id=':6')
 
         # 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='height')
 
         # Test the data.
         
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities['test']), 
+1.851056e+06)
-        
self.assertEqual(list(cdp.mol[0].res[1].spin[1].intensities['test']), 
+3.224387e+05)
-        
self.assertEqual(list(cdp.mol[0].res[2].spin[1].intensities['test']), 
+1.479366e+06)
+        
self.assertEqual(list(cdp.mol[0].res[1].spin[0].intensities['test']), 
+3.224387e+05)
+        
self.assertEqual(list(cdp.mol[0].res[2].spin[0].intensities['test']), 
+1.479366e+06)
 
 
     def test_read_peak_list_sparky(self):