r11819 - in /branches/peak_list_handling/test_suite: shared_data/saved_states/ system_tests/ -- December 14, 2010 - 19:03

Author: bugman
Date: Tue Dec 14 19:02:59 2010
New Revision: 11819

URL: http://svn.gna.org/viewcvs/relax?rev=11819&view=rev
Log:
Fix for the Relax_fit.test_read_sparky system test.

This was solely a problem within the test and its data.


Modified:
    
branches/peak_list_handling/test_suite/shared_data/saved_states/basic_heights_T2_ncyc1.bz2
    
branches/peak_list_handling/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py
    branches/peak_list_handling/test_suite/system_tests/relax_fit.py

Modified: 
branches/peak_list_handling/test_suite/shared_data/saved_states/basic_heights_T2_ncyc1.bz2
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_list_handling/test_suite/shared_data/saved_states/basic_heights_T2_ncyc1.bz2?rev=11819&r1=11818&r2=11819&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
branches/peak_list_handling/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_list_handling/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py?rev=11819&r1=11818&r2=11819&view=diff
==============================================================================
--- 
branches/peak_list_handling/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py
 (original)
+++ 
branches/peak_list_handling/test_suite/shared_data/saved_states/create_peak_heights_T2_ncyc1.py
 Tue Dec 14 19:02:59 2010
@@ -14,7 +14,7 @@
 ds.add(pipe_name='rx', pipe_type='relax_fit')
 
 # Load the Lupin Ap4Aase sequence.
-sequence.read(file="Ap4Aase.seq", dir=__main__.install_path + 
sep+'test_suite'+sep+'shared_data')
+sequence.read(file="Ap4Aase.seq", dir=__main__.install_path + 
sep+'test_suite'+sep+'shared_data', res_num_col=1, res_name_col=2)
 
 # Name the spins so they can be matched to the assignments.
 spin.name(name='N')

Modified: branches/peak_list_handling/test_suite/system_tests/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/peak_list_handling/test_suite/system_tests/relax_fit.py?rev=11819&r1=11818&r2=11819&view=diff
==============================================================================
--- branches/peak_list_handling/test_suite/system_tests/relax_fit.py 
(original)
+++ branches/peak_list_handling/test_suite/system_tests/relax_fit.py Tue Dec 
14 19:02:59 2010
@@ -168,4 +168,5 @@
 
             # Check intensities (if they exist).
             if hasattr(orig_spin, 'intensities'):
-                self.assertEqual(orig_spin.intensities[0], 
new_spin.intensities[0])
+                for id in dp_new.spectrum_ids:
+                    self.assertEqual(orig_spin.intensities[id], 
new_spin.intensities[id])