r9864 - /branches/relax_disp/specific_fns/relax_disp.py -- November 02, 2009 - 21:11

Author: semor
Date: Mon Nov  2 21:11:33 2009
New Revision: 9864

URL: http://svn.gna.org/viewcvs/relax?rev=9864&view=rev
Log:
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_fns/relax_disp.py

Modified: branches/relax_disp/specific_fns/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_fns/relax_disp.py?rev=9864&r1=9863&r2=9864&view=diff
==============================================================================
--- branches/relax_disp/specific_fns/relax_disp.py (original)
+++ branches/relax_disp/specific_fns/relax_disp.py Mon Nov  2 21:11:33 2009
@@ -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'