r8072 - /branches/spectral_errors/generic_fns/spectrum.py -- December 01, 2008 - 10:47

Author: bugman
Date: Mon Dec  1 10:47:02 2008
New Revision: 8072

URL: http://svn.gna.org/viewcvs/relax?rev=8072&view=rev
Log:
Print out refinement of the __errors_repl() function.


Modified:
    branches/spectral_errors/generic_fns/spectrum.py

Modified: branches/spectral_errors/generic_fns/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/generic_fns/spectrum.py?rev=8072&r1=8071&r2=8072&view=diff
==============================================================================
--- branches/spectral_errors/generic_fns/spectrum.py (original)
+++ branches/spectral_errors/generic_fns/spectrum.py Mon Dec  1 10:47:02 2008
@@ -90,9 +90,6 @@
     if hasattr(cdp, 'sigma_I'):
         raise RelaxError, "The peak intensity standard deviation of all 
spectra has already been calculated."
 
-    # Print out.
-    print "\nCalculating peak intensity standard deviation of all replicated 
spectra."
-
     # Initialise.
     cdp.sigma_I = [0.0] * len(cdp.spectrum_ids)
     cdp.var_I = [0.0] * len(cdp.spectrum_ids)
@@ -121,7 +118,7 @@
             indices[j] = cdp.spectrum_ids.index(spectra[j])
 
         # Print out.
-        print "\nSpectra:  " + `spectra`
+        print "\nReplicated spectra:  " + `spectra`
         if verbosity:
             print "%-5s%-6s%-20s%-20s" % ("Num", "Name", "Average", "SD")
 
@@ -177,6 +174,9 @@
 
     # Average across all spectra if there are time points with a single 
spectrum.
     if not all_repl:
+        # Print out.
+        print "\nVariance averaging over all spectra."
+
         # Initialise.
         var_I = 0.0
         num_dups = 0
@@ -199,7 +199,7 @@
             cdp.var_I[i] = var_I
 
         # Print out.
-        print "\nStandard deviation (variance averaged over all spectra):  " 
+ `sqrt(var_I)`
+        print "Standard deviation for all spins:  " + `sqrt(var_I)`
 
     # Loop over the spectra.
     for i in xrange(len(cdp.spectrum_ids)):