Author: semor Date: Thu Dec 4 02:14:08 2008 New Revision: 8118 URL: http://svn.gna.org/viewcvs/relax?rev=8118&view=rev Log: Continued the implementation of the reading of the generic peak intensity file. The good file is now input. Modified: 1.3/test_suite/system_tests/peak_lists.py Modified: 1.3/test_suite/system_tests/peak_lists.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/peak_lists.py?rev=8118&r1=8117&r2=8118&view=diff ============================================================================== --- 1.3/test_suite/system_tests/peak_lists.py (original) +++ 1.3/test_suite/system_tests/peak_lists.py Thu Dec 4 02:14:08 2008 @@ -61,9 +61,13 @@ self.relax.interpreter._Spin.name(name='N') # Read the peak list. - self.relax.interpreter._Spectrum.read_intensities(file="generic.txt", dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", spectrum_id='test', int_method='height') - - # Test the data. + self.relax.interpreter._Spectrum.read_intensities(file="generic_intensity.txt", dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", spectrum_id='test', int_method='height') + + # Test the data. + self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 1.0000) + self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 1.0000) + self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 1.0000) + self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 1.0000) self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 1.0000)