r19473 - /branches/relax_disp/auto_analyses/relax_disp.py -- April 12, 2013 - 11:35

Author: bugman
Date: Fri Apr 12 11:35:23 2013
New Revision: 19473

URL: http://svn.gna.org/viewcvs/relax?rev=19473&view=rev
Log:
Expanded the write_results() method of the relaxation dispersion 
auto-analysis.

More Grace graphs are now being produced, and the Rex file creation is now 
model dependent.


Modified:
    branches/relax_disp/auto_analyses/relax_disp.py

Modified: branches/relax_disp/auto_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/auto_analyses/relax_disp.py?rev=19473&r1=19472&r2=19473&view=diff
==============================================================================
--- branches/relax_disp/auto_analyses/relax_disp.py (original)
+++ branches/relax_disp/auto_analyses/relax_disp.py Fri Apr 12 11:35:23 2013
@@ -144,9 +144,16 @@
         self.interpreter.results.write(file='results', dir=path, force=True)
 
         # Save the relaxation dispersion parameters.
-        self.interpreter.value.write(param='rex', file='rex.out', dir=path, 
force=True)
+        if cdp.model not in ['exp_fit']:
+            self.interpreter.value.write(param='rex', file='Rex.out', 
dir=path, force=True)
 
         # Create Grace plots of the data.
         self.interpreter.grace.write(y_data_type='chi2', file='chi2.agr', 
dir=path, force=True)
-        self.interpreter.grace.write(x_data_type='res_num', 
y_data_type='r2eff', file='r2eff.agr', dir=path, force=True)
-        self.interpreter.grace.write(x_data_type='spin_lock_nu1', 
y_data_type='r2eff', file='dispersion_curves.agr', dir=path, force=True)
+        self.interpreter.grace.write(x_data_type='res_num', 
y_data_type='r2eff', file='R2eff.agr', dir=path, force=True)
+        self.interpreter.grace.write(x_data_type='res_num', 
y_data_type='i0', file='I0.agr', dir=path, force=True)
+        if hasattr(cdp, 'spin_lock_nu1'):
+            self.interpreter.grace.write(x_data_type='spin_lock_nu1', 
y_data_type='r2eff', file='dispersion_curves.agr', dir=path, force=True)
+        elif hasattr(cdp, 'cpmg_frq'):
+            self.interpreter.grace.write(x_data_type='cpmg_frq', 
y_data_type='r2eff', file='dispersion_curves.agr', dir=path, force=True)
+        if cdp.model not in ['exp_fit']:
+            self.interpreter.grace.write(x_data_type='res_num', 
y_data_type='rex', file='Rex.agr', dir=path, force=True)