r12653 - /branches/relax_data/generic_fns/relax_data.py -- March 01, 2011 - 17:24

Author: bugman
Date: Tue Mar  1 17:24:32 2011
New Revision: 12653

URL: http://svn.gna.org/viewcvs/relax?rev=12653&view=rev
Log:
Simplified the return_data_desc() function.


Modified:
    branches/relax_data/generic_fns/relax_data.py

Modified: branches/relax_data/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data/generic_fns/relax_data.py?rev=12653&r1=12652&r2=12653&view=diff
==============================================================================
--- branches/relax_data/generic_fns/relax_data.py (original)
+++ branches/relax_data/generic_fns/relax_data.py Tue Mar  1 17:24:32 2011
@@ -972,23 +972,9 @@
     @type name:     str
     """
 
-    if name == 'num_frq':
-        return 'Number of spectrometer frequencies'
-    if name == 'frq':
-        return 'Frequencies'
-    if name == 'frq_labels':
-        return 'Frequency labels'
-    if name == 'num_ri':
-        return 'Number of relaxation data sets'
-    if name == 'ri_labels':
-        return 'Relaxation data set labels'
-    if name == 'remap_table':
-        return 'Table mapping frequencies to relaxation data'
-    if name == 'noe_r1_table':
-        return 'Table mapping the NOE to the corresponding R1'
-    if name == 'relax_data':
+    if name == 'ri_data':
         return 'The relaxation data'
-    if name == 'relax_error':
+    if name == 'ri_data_err':
         return 'The relaxation data errors'