r12733 - /branches/relax_data/specific_fns/model_free/main.py -- March 02, 2011 - 17:38

Author: bugman
Date: Wed Mar  2 17:38:00 2011
New Revision: 12733

URL: http://svn.gna.org/viewcvs/relax?rev=12733&view=rev
Log:
Reverted revision r12727, as this is used in the XML file generation.

The command used was:
svn merge -r12727:12726 .

.....
  r12727 | bugman | 2011-03-02 16:51:53 +0100 (Wed, 02 Mar 2011) | 3 lines
  Changed paths:
     M /branches/relax_data/specific_fns/model_free/main.py
  
  Removed the relaxation data data structure names from the model-free 
data_names() method.
.....


Modified:
    branches/relax_data/specific_fns/model_free/main.py

Modified: branches/relax_data/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data/specific_fns/model_free/main.py?rev=12733&r1=12732&r2=12733&view=diff
==============================================================================
--- branches/relax_data/specific_fns/model_free/main.py (original)
+++ branches/relax_data/specific_fns/model_free/main.py Wed Mar  2 17:38:00 
2011
@@ -1303,6 +1303,10 @@
             names.append('h_count')
             names.append('warning')
 
+        # Relaxation data.
+        if set == 'all':
+            names = names + relax_data.get_data_names()
+
         # Parameter errors.
         if error_names and (set == 'all' or set == 'params'):
             names.append('s2_err')
@@ -1328,6 +1332,10 @@
             names.append('rex_sim')
             names.append('r_sim')
             names.append('csa_sim')
+
+        # Relaxation data simulation values.
+        if sim_names and set == 'all':
+            names = names + relax_data.get_data_names(sim_names=True)
 
         # Return the names.
         return names