r17695 - /branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_2param_neg.py -- October 04, 2012 - 10:20

Author: bugman
Date: Thu Oct  4 10:20:24 2012
New Revision: 17695

URL: http://svn.gna.org/viewcvs/relax?rev=17695&view=rev
Log:
Manual merge of a file not updated in the svnmerge of the previous commit 
(r17694).

The command used was:
svn merge -r17254:r17687 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk/test_suite/system_tests/scripts/relax_fit.py
 test_suite/system_tests/scripts/relax_fit_exp_2param_neg.py


Modified:
    
branches/inversion-recovery/test_suite/system_tests/scripts/relax_fit_exp_2param_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=17695&r1=17694&r2=17695&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 Oct  4 10:20:24 2012
@@ -60,7 +60,7 @@
 # Load the data twice to test data deletion.
 for iter in range(2):
     # Loop over the spectra.
-    for i in xrange(len(names)):
+    for i in range(len(names)):
         # Load the peak intensities.
         spectrum.read_intensities(file=names[i]+'.list', dir=data_path, 
spectrum_id=names[i], int_method=ds.int_type)