r8075 - /branches/spectral_errors/specific_fns/relax_fit.py -- December 01, 2008 - 10:53

Author: bugman
Date: Mon Dec  1 10:53:49 2008
New Revision: 8075

URL: http://svn.gna.org/viewcvs/relax?rev=8075&view=rev
Log:
Replaced all references to 'average peak intensity'.  These are no longer 
averaged.


Modified:
    branches/spectral_errors/specific_fns/relax_fit.py

Modified: branches/spectral_errors/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spectral_errors/specific_fns/relax_fit.py?rev=8075&r1=8074&r2=8075&view=diff
==============================================================================
--- branches/spectral_errors/specific_fns/relax_fit.py (original)
+++ branches/spectral_errors/specific_fns/relax_fit.py Mon Dec  1 10:53:49 
2008
@@ -682,7 +682,7 @@
             ######################################
 
             if sim_index == None:
-                values = spin.ave_intensities
+                values = spin.intensities
             else:
                 values = spin.sim_intensities[sim_index]
 
@@ -898,7 +898,7 @@
         |                                   |                      |         
                    |
         | Relaxation rate                   | 'rx'                 | 
'^[Rr]x$'                   |
         |                                   |                      |         
                    |
-        | Average peak intensities (series) | 'ave_intensities'    | 
'^[Aa]ve[ -_][Ii]nt$'       |
+        | Peak intensities (series)         | 'intensities'        | 
'^[Ii]nt$'                  |
         |                                   |                      |         
                    |
         | Initial intensity                 | 'i0'                 | 
'^[Ii]0$'                   |
         |                                   |                      |         
                    |
@@ -913,9 +913,9 @@
         if match('^[Rr]x$', name):
             return 'rx'
 
-        # Average peak intensities (series)
-        if match('^[Aa]ve[ -_][Ii]nt$', name):
-            return 'ave_intensities'
+        # Peak intensities (series)
+        if match('^[Ii]nt$', name):
+            return 'intensities'
 
         # Initial intensity.
         if match('^[Ii]0$', name):
@@ -940,9 +940,9 @@
         if object_name == 'rx':
             grace_string = '\\qR\\sx\\Q'
 
-        # Average peak intensities.
-        elif object_name == 'ave_intensities':
-            grace_string = '\\qAverage peak intensities\\Q'
+        # Peak intensities.
+        elif object_name == 'intensities':
+            grace_string = '\\qPeak intensities\\Q'
 
         # Initial intensity.
         elif object_name == 'i0':