r22402 - /trunk/test_suite/system_tests/relax_disp.py -- March 05, 2014 - 16:34

Author: tlinnet
Date: Wed Mar  5 16:34:50 2014
New Revision: 22402

URL: http://svn.gna.org/viewcvs/relax?rev=22402&view=rev
Log:
Added reading of R1 values in systemtest Relax_disp.test_r1rho_kjaergaard.

Regarding sr #3124, (https://gna.org/support/index.php?3124) - Grace graphs 
production for R1rho analysis with R2_eff as function of Omega_eff.

Modified:
    trunk/test_suite/system_tests/relax_disp.py

Modified: trunk/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=22402&r1=22401&r2=22402&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Wed Mar  5 16:34:50 2014
@@ -2661,6 +2661,9 @@
                 # Add to counter
                 j += 1
 
+        # Read the R1 data
+        self.interpreter.relax_data.read(ri_id='R1', ri_type='R1', 
frq=cdp.spectrometer_frq_list[0], file='R1_fitted_values.txt', dir=data_path, 
mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, 
spin_name_col=5, data_col=6, error_col=7)
+
         print("Testing the number of settings")
         print("Number of settings iterations is: %s. Number of 
cdp.exp_type.keys() is: %s"%(i, len(cdp.exp_type.keys() ) ) )
         self.assertEqual(70, len(expfileslines))
@@ -2801,36 +2804,49 @@
         # Check the initial setup.
         self.assertEqual(cdp.mol[0].res[7].num, 13)
         self.assertEqual(cdp.mol[0].res[7].spin[0].kex, guess[':13@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[7].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[9].num, 15)
         self.assertEqual(cdp.mol[0].res[9].spin[0].kex, guess[':15@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[9].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[10].num, 16)
         self.assertEqual(cdp.mol[0].res[10].spin[0].kex, guess[':16@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[10].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[16].num, 25)
         self.assertEqual(cdp.mol[0].res[16].spin[0].kex, guess[':25@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[16].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[17].num, 26)
         self.assertEqual(cdp.mol[0].res[17].spin[0].kex, guess[':26@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[17].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[19].num, 28)
         self.assertEqual(cdp.mol[0].res[19].spin[0].kex, guess[':28@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[19].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[29].num, 39)
         self.assertEqual(cdp.mol[0].res[29].spin[0].kex, guess[':39@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[29].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[30].num, 40)
         self.assertEqual(cdp.mol[0].res[30].spin[0].kex, guess[':40@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[30].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[31].num, 41)
         self.assertEqual(cdp.mol[0].res[31].spin[0].kex, guess[':41@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[31].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[33].num, 43)
         self.assertEqual(cdp.mol[0].res[33].spin[0].kex, guess[':43@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[33].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[34].num, 44)
         self.assertEqual(cdp.mol[0].res[34].spin[0].kex, guess[':44@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[34].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[35].num, 45)
         self.assertEqual(cdp.mol[0].res[35].spin[0].kex, guess[':45@N'][6])
-        self.assertEqual(cdp.mol[0].res[35].num, 45)
-        self.assertEqual(cdp.mol[0].res[35].spin[0].kex, guess[':45@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[35].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[38].num, 49)
         self.assertEqual(cdp.mol[0].res[38].spin[0].kex, guess[':49@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[38].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[41].num, 52)
         self.assertEqual(cdp.mol[0].res[41].spin[0].kex, guess[':52@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[41].spin[0], 'ri_data'))
         self.assertEqual(cdp.mol[0].res[42].num, 53)
         self.assertEqual(cdp.mol[0].res[42].spin[0].kex, guess[':53@N'][6])
+        self.assert_(hasattr(cdp.mol[0].res[42].spin[0], 'ri_data'))
 
         # The dispersion models.
         MODELS = ['R2eff', 'DPL94']