r7691 - in /1.3/test_suite/system_tests: nmrview.py sparky.py -- October 13, 2008 - 20:24

Author: semor
Date: Mon Oct 13 20:24:28 2008
New Revision: 7691

URL: http://svn.gna.org/viewcvs/relax?rev=7691&view=rev
Log:
Fixed the test for the setting of Sparky and NMRView intensities.


Modified:
    1.3/test_suite/system_tests/nmrview.py
    1.3/test_suite/system_tests/sparky.py

Modified: 1.3/test_suite/system_tests/nmrview.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/nmrview.py?rev=7691&r1=7690&r2=7691&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/nmrview.py (original)
+++ 1.3/test_suite/system_tests/nmrview.py Mon Oct 13 20:24:28 2008
@@ -60,5 +60,5 @@
         self.relax.interpreter._Relax_fit.read(file="cNTnC.xpk", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", relax_time=0.0176, 
format='nmrview')
 
         # Test the data.
-        self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 
-6.88333129883)
-        self.assertEqual(cdp.mol[0].res[1].spin[0].intensities[0], 
-5.49038267136)
+        self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0][0], 
-6.88333129883)
+        self.assertEqual(cdp.mol[0].res[1].spin[0].intensities[0][0], 
-5.49038267136)

Modified: 1.3/test_suite/system_tests/sparky.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/sparky.py?rev=7691&r1=7690&r2=7691&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/sparky.py (original)
+++ 1.3/test_suite/system_tests/sparky.py Mon Oct 13 20:24:28 2008
@@ -62,7 +62,7 @@
         self.relax.interpreter._Relax_fit.read(file="ref_ave.list", 
dir=sys.path[-1] + "/test_suite/shared_data/peak_lists", relax_time=0.0, 
format='sparky')
 
         # Test the data.
-        self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0], 6262)
-        self.assertEqual(cdp.mol[0].res[1].spin[0].intensities[0], 148614)
-        self.assertEqual(cdp.mol[0].res[2].spin[0].intensities[0], 166842)
-        self.assertEqual(cdp.mol[0].res[3].spin[0].intensities[0], 128690)
+        self.assertEqual(cdp.mol[0].res[0].spin[0].intensities[0][0], 6262)
+        self.assertEqual(cdp.mol[0].res[1].spin[0].intensities[0][0], 148614)
+        self.assertEqual(cdp.mol[0].res[2].spin[0].intensities[0][0], 166842)
+        self.assertEqual(cdp.mol[0].res[3].spin[0].intensities[0][0], 128690)