r14444 - /branches/inversion-recovery/test_suite/system_tests/scripts/ -- August 25, 2011 - 12:41

Author: semor
Date: Thu Aug 25 12:41:11 2011
New Revision: 14444

URL: http://svn.gna.org/viewcvs/relax?rev=14444&view=rev
Log:
Corrected the placement of the deselect.read() function.

The system tests below were failing otherwise.
  * Relax_fit.test_curve_fitting_height_exp_2param_neg
  * Relax_fit.test_curve_fitting_volume_exp_2param_neg

Is this a bug ?


Modified:
    
branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_2param_neg.py
    
branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py

Modified: 
branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_2param_neg.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_2param_neg.py?rev=14444&r1=14443&r2=14444&view=diff
==============================================================================
--- 
branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_2param_neg.py
 (original)
+++ 
branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_2param_neg.py
 Thu Aug 25 12:41:11 2011
@@ -22,6 +22,9 @@
 
 # Load the sequence.
 sequence.read('Ap4Aase.seq', dir=status.install_path + 
sep+'test_suite'+sep+'shared_data', res_num_col=1, res_name_col=2)
+
+# Deselect unresolved spins.
+deselect.read(file='unresolved', dir=data_path, res_num_col=1)
 
 # Name the spins so they can be matched to the assignments.
 spin.name(name='N')
@@ -71,9 +74,6 @@
 # Peak intensity error analysis.
 spectrum.error_analysis()
 
-# Deselect unresolved spins.
-deselect.read(file='unresolved', dir=data_path, res_num_col=1)
-
 # Set the relaxation curve type.
 relax_fit.select_model('exp_2param_neg')
 

Modified: 
branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py?rev=14444&r1=14443&r2=14444&view=diff
==============================================================================
--- 
branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py
 (original)
+++ 
branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py
 Thu Aug 25 12:41:11 2011
@@ -22,6 +22,9 @@
 
 # Load the sequence.
 sequence.read('Ap4Aase.seq', dir=status.install_path + 
sep+'test_suite'+sep+'shared_data', res_num_col=1, res_name_col=2)
+
+# Deselect unresolved spins.
+deselect.read(file='unresolved', dir=data_path, res_num_col=1)
 
 # Name the spins so they can be matched to the assignments.
 spin.name(name='N')
@@ -65,9 +68,6 @@
 # Peak intensity error analysis.
 spectrum.error_analysis()
 
-# Deselect unresolved spins.
-deselect.read(file='unresolved', dir=data_path, res_num_col=1)
-
 # Set the relaxation curve type.
 relax_fit.select_model('exp_3param_inv_neg')