r19252 - /branches/relax_disp/specific_analyses/relax_disp.py -- March 27, 2013 - 15:49

Author: bugman
Date: Wed Mar 27 15:49:13 2013
New Revision: 19252

URL: http://svn.gna.org/viewcvs/relax?rev=19252&view=rev
Log:
Ported r9864 from the old relax_disp branch into the new branch.

The command used was:
svn merge -r9863:9864 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123
 specific_analyses

.....
  r9864 | semor | 2009-11-02 21:11:33 +0100 (Mon, 02 Nov 2009) | 5 lines
  Changed paths:
     M /branches/relax_disp/specific_fns/relax_disp.py
  
  Solved an issue created during the merge process (r9863) concerning the 
'return_data_name_doc' call.
  
  The solution is based on the code in 'specific_fns/relax_fit.py'.
.....


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py

Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19252&r1=19251&r2=19252&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 15:49:13 
2013
@@ -1113,8 +1113,7 @@
         return spin.intensities
 
 
-    def return_data_name(self, name):
-        """
+    return_data_name_doc =  """
         Relaxation dispersion curve fitting data type string matching 
patterns
         
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -1142,6 +1141,15 @@
 
         """
 
+    def return_data_name(self, name):
+        """Return a unique identifying string for the relaxation dispersion 
curve-fitting parameter.
+
+        @param name:    The relaxation dispersion curve-fitting parameter.
+        @type name:     str
+        @return:        The unique parameter identifying string.
+        @rtype:         str
+        """
+
         # Transversal relaxation rate.
         if match('^[Rr]2$', name):
             return 'r2'