r13744 - in /branches/gui_testing: ./ generic_fns/spectrum.py test_suite/system_tests/scripts/relax_fit.py -- July 19, 2011 - 17:22

Author: bugman
Date: Tue Jul 19 17:22:35 2011
New Revision: 13744

URL: http://svn.gna.org/viewcvs/relax?rev=13744&view=rev
Log:
Merged revisions 13742-13743 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r13742 | bugman | 2011-07-19 17:02:29 +0200 (Tue, 19 Jul 2011) | 6 lines
  
  Changed the order of some of the replicated spectra in the 
test_curve_fitting_height system test.
  
  This triggers a bug in the spectra.error_analysis user function which looks 
like the replicated
  spectra list is order dependent (when it shouldn't be).
........
  r13743 | bugman | 2011-07-19 17:18:49 +0200 (Tue, 19 Jul 2011) | 7 lines
  
  Bug fix for the spectrum user functions for when the ID order does not 
match those loaded.
  
  If the order of IDs sent to spectrum.replicated did not match the order 
they were loaded by 
  spectrum.read_intensities, then the spectrum.error_analysis user function 
would fail.  The order is
  no longer important.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/generic_fns/spectrum.py
    branches/gui_testing/test_suite/system_tests/scripts/relax_fit.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 19 17:22:35 2011
@@ -1,1 +1,1 @@
-/1.3:1-13706
+/1.3:1-13743

Modified: branches/gui_testing/generic_fns/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/spectrum.py?rev=13744&r1=13743&r2=13744&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/spectrum.py (original)
+++ branches/gui_testing/generic_fns/spectrum.py Tue Jul 19 17:22:35 2011
@@ -394,8 +394,8 @@
         cdp.var_I[id] = cdp.var_I[id] / float(count)
 
         # Set all spectra variances.
-        for j in xrange(1, num_spectra):
-            cdp.var_I[spectra[j]] = cdp.var_I[spectra[0]]
+        for j in range(num_spectra):
+            cdp.var_I[spectra[j]] = cdp.var_I[id]
 
         # Print out.
         print(("Standard deviation:  %s" % sqrt(cdp.var_I[id])))

Modified: branches/gui_testing/test_suite/system_tests/scripts/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/scripts/relax_fit.py?rev=13744&r1=13743&r2=13744&view=diff
==============================================================================
--- branches/gui_testing/test_suite/system_tests/scripts/relax_fit.py 
(original)
+++ branches/gui_testing/test_suite/system_tests/scripts/relax_fit.py Tue Jul 
19 17:22:35 2011
@@ -65,7 +65,7 @@
 # Specify the duplicated spectra.
 spectrum.replicated(spectrum_ids=['T2_ncyc1_ave', 'T2_ncyc1b_ave'])
 spectrum.replicated(spectrum_ids=['T2_ncyc4_ave', 'T2_ncyc4b_ave'])
-spectrum.replicated(spectrum_ids=['T2_ncyc9_ave', 'T2_ncyc9b_ave'])
+spectrum.replicated(spectrum_ids=['T2_ncyc9b_ave', 'T2_ncyc9_ave'])
 spectrum.replicated(spectrum_ids=['T2_ncyc11_ave', 'T2_ncyc11b_ave'])
 
 # Peak intensity error analysis.